diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 16:30:21 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 16:30:21 +0100 |
| commit | 34a7728cec5c17ef25f3d5cd56421e4f5258862d (patch) | |
| tree | f8fcf0aced9b106facff2e50405a19288931da6b /Graphics/drawables/originals/ic_action_nfc/NFC.png | |
| parent | b73ad7d87e7ddef03c17b4983f526c0613403df6 (diff) | |
| parent | e049895b9f8f5f9996ac678acf6810768e859695 (diff) | |
| download | open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.gz open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.bz2 open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.zip | |
Merge branch 'development' into detached-sigs-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'Graphics/drawables/originals/ic_action_nfc/NFC.png')
| -rw-r--r-- | Graphics/drawables/originals/ic_action_nfc/NFC.png | bin | 0 -> 88038 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/Graphics/drawables/originals/ic_action_nfc/NFC.png b/Graphics/drawables/originals/ic_action_nfc/NFC.png Binary files differnew file mode 100644 index 000000000..96af64049 --- /dev/null +++ b/Graphics/drawables/originals/ic_action_nfc/NFC.png |