diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-05 01:22:01 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-05 01:22:01 +0200 |
| commit | 60fb3b60a8016d69e8b1c67b979674712799beac (patch) | |
| tree | ad708e8fed11b5403ec93a8d8a720c1643aead92 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java | |
| parent | dff68ac194d71d8a283ec80a1e8640da3bfd3e44 (diff) | |
| parent | d99115c26315d0d1df2ef638f60d5caca5269096 (diff) | |
| download | open-keychain-60fb3b60a8016d69e8b1c67b979674712799beac.tar.gz open-keychain-60fb3b60a8016d69e8b1c67b979674712799beac.tar.bz2 open-keychain-60fb3b60a8016d69e8b1c67b979674712799beac.zip | |
Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java')
0 files changed, 0 insertions, 0 deletions