diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-15 17:39:36 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-15 17:39:36 +0200 |
| commit | 858fe47d4677d4c727d0696a2d683a349ad2ad3b (patch) | |
| tree | e13f65753f0b4ce9db35d1a6e10cec0db92161ea /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java | |
| parent | bdde6a3bd843e05f0fa5065ca31ed96d09731d86 (diff) | |
| parent | 0ce9c131327ce754eb8c0c934ea59eecf005a26e (diff) | |
| download | open-keychain-858fe47d4677d4c727d0696a2d683a349ad2ad3b.tar.gz open-keychain-858fe47d4677d4c727d0696a2d683a349ad2ad3b.tar.bz2 open-keychain-858fe47d4677d4c727d0696a2d683a349ad2ad3b.zip | |
Merge remote-tracking branch 'origin/master' into external-test
Conflicts:
OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java')
0 files changed, 0 insertions, 0 deletions