diff options
| author | Daniel Hammann <github@honnel.de> | 2014-03-22 15:46:30 +0100 |
|---|---|---|
| committer | Daniel Hammann <github@honnel.de> | 2014-03-22 15:46:30 +0100 |
| commit | 36376c49997b82ac74871c922e2f1ba75b8e214f (patch) | |
| tree | 440c1850be222d857d35bb9e334ec0474f21392c /OpenPGP-Keychain-API/libraries/openpgp-api-library | |
| parent | 9c180629510d6b07aa296088f61593234b52a14a (diff) | |
| parent | 4e285d9254f98381bd59a9a683d406ad1b6020d6 (diff) | |
| download | open-keychain-36376c49997b82ac74871c922e2f1ba75b8e214f.tar.gz open-keychain-36376c49997b82ac74871c922e2f1ba75b8e214f.tar.bz2 open-keychain-36376c49997b82ac74871c922e2f1ba75b8e214f.zip | |
Merge branch 'save-key-workaround' of https://github.com/honnel/openpgp-keychain into save-key-workaround
Conflicts:
OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenPGP-Keychain-API/libraries/openpgp-api-library')
0 files changed, 0 insertions, 0 deletions