diff options
| author | mar-v-in <github@rvin.mooo.com> | 2014-05-29 11:33:53 +0200 |
|---|---|---|
| committer | mar-v-in <github@rvin.mooo.com> | 2014-05-29 11:33:53 +0200 |
| commit | d4cdc36448645c26b95f453a0790a4a9fc1d0b52 (patch) | |
| tree | caafb5cda50f7f6ad5f05939f7e73a83a450039b /OpenKeychain/src/androidTest/java | |
| parent | 3417a7a2de190efe5c5ea19581dd4f099453a99e (diff) | |
| parent | c676e534799545f6aa95071463c10aa0b2f92b9d (diff) | |
| download | open-keychain-d4cdc36448645c26b95f453a0790a4a9fc1d0b52.tar.gz open-keychain-d4cdc36448645c26b95f453a0790a4a9fc1d0b52.tar.bz2 open-keychain-d4cdc36448645c26b95f453a0790a4a9fc1d0b52.zip | |
Merge branch 'hkps-support' into automatic-contact-discovery
Diffstat (limited to 'OpenKeychain/src/androidTest/java')
0 files changed, 0 insertions, 0 deletions