diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-21 23:06:25 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-05-21 23:06:51 +0200 |
| commit | 952bb99a2467bb5c1c2988d33451df0249e04a42 (patch) | |
| tree | 7c8cdeba0812cf84443880010cbedc73ab3a52d7 /OpenKeychain/src/androidTest | |
| parent | 6d7daec37f9ac7efbdd687c97ca45f9c9ddc5602 (diff) | |
| parent | 8a2ffd8f90e9653ed69f945a94f6b9702dbdfff4 (diff) | |
| download | open-keychain-952bb99a2467bb5c1c2988d33451df0249e04a42.tar.gz open-keychain-952bb99a2467bb5c1c2988d33451df0249e04a42.tar.bz2 open-keychain-952bb99a2467bb5c1c2988d33451df0249e04a42.zip | |
Merge remote-tracking branch 'origin/master' into wrapped-key-ring
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenKeychain/src/androidTest')
0 files changed, 0 insertions, 0 deletions