Resolved Conflicts
[proxmark3-svn] / client / mifare / ndef.c
2019-03-19 Oleg MoiseenkoNdef and MAD (#801)
Impressum, Datenschutz