diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-28 16:37:15 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-05-28 16:37:15 +0200 |
| commit | 40703fe961eef8d884800b70d9af57da9fce2769 (patch) | |
| tree | 243575bae2a32a872c2b5f902cb259bd383d15a7 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java | |
| parent | 4ecd4389b3f09ad7b8ee30cc072f64da3f2b4f51 (diff) | |
| parent | ee02e110e7f1a90d2a91c4fc09834b8c073cbba7 (diff) | |
| download | open-keychain-40703fe961eef8d884800b70d9af57da9fce2769.tar.gz open-keychain-40703fe961eef8d884800b70d9af57da9fce2769.tar.bz2 open-keychain-40703fe961eef8d884800b70d9af57da9fce2769.zip | |
Merge branch 'master' into development
Conflicts:
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java')
0 files changed, 0 insertions, 0 deletions