Dominik Schürmann 83ab483fc7 Merge pull request #2201 from open-keychain/gnuk-new ... Gnuk		2017-11-01 14:45:29 +01:00
..
assets
java	add Nitrokey Pro to whitelist for reset and key import after testing	2017-10-31 16:07:07 +01:00
res	Merge pull request #2201 from open-keychain/gnuk-new	2017-11-01 14:45:29 +01:00
AndroidManifest.xml	Add "Where is my NFC reader?" feature to nfc waiting dialog	2017-10-10 05:06:40 +02:00