diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-08-01 05:29:40 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-08-01 05:29:40 +0200 |
| commit | fc2a1f583856d66c4fe13e9f77218dca79a9ccca (patch) | |
| tree | 3e6e470863c700cb1096230aefbe36bc698c2ee6 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider | |
| parent | c71cdc143238e46a10cbf6a2619801e1b4af6d29 (diff) | |
| parent | 79f69f2fcee67e347d1b072ced74947393e144bb (diff) | |
| download | open-keychain-fc2a1f583856d66c4fe13e9f77218dca79a9ccca.tar.gz open-keychain-fc2a1f583856d66c4fe13e9f77218dca79a9ccca.tar.bz2 open-keychain-fc2a1f583856d66c4fe13e9f77218dca79a9ccca.zip | |
Merge branch 'master' into improve-file-more
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider')
0 files changed, 0 insertions, 0 deletions