diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-03 02:20:38 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-03 02:20:38 +0200 |
| commit | ef7eab2c8bf7eda281849d66f201070f5e142304 (patch) | |
| tree | bf21540073f932b9e6d5c083af7569ddb58f1d5c /OpenKeychain/src/main/java/android | |
| parent | b9dc21969faa7c4cd7b10638a629690d0df20cf4 (diff) | |
| parent | 4b4e885e55f788bd2cf05f3c83f5a4bccb6cd0c0 (diff) | |
| download | open-keychain-ef7eab2c8bf7eda281849d66f201070f5e142304.tar.gz open-keychain-ef7eab2c8bf7eda281849d66f201070f5e142304.tar.bz2 open-keychain-ef7eab2c8bf7eda281849d66f201070f5e142304.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
Diffstat (limited to 'OpenKeychain/src/main/java/android')
0 files changed, 0 insertions, 0 deletions