diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-11 20:21:19 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-07-11 21:00:26 +0200 |
| commit | 54bc874ce558866e70e54c0076cbee1f51823be7 (patch) | |
| tree | 824420ab99b744755d0edd7f1dda8dfd865c08b5 /OpenKeychain-Test/src/test/java | |
| parent | d4fa2bbf47c2b2b722ecd2032e8479b405d65b59 (diff) | |
| parent | 9fcc0a881648dd42ca854cb9a19f9627154bdbb5 (diff) | |
| download | open-keychain-54bc874ce558866e70e54c0076cbee1f51823be7.tar.gz open-keychain-54bc874ce558866e70e54c0076cbee1f51823be7.tar.bz2 open-keychain-54bc874ce558866e70e54c0076cbee1f51823be7.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/OperationResultParcel.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
Diffstat (limited to 'OpenKeychain-Test/src/test/java')
0 files changed, 0 insertions, 0 deletions