diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-30 13:09:27 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-12-30 13:09:27 +0100 |
| commit | 9e663237b6dc4880bcdb1c763374c44f9f4416d2 (patch) | |
| tree | 3c317cf8a9e320db0b6ff5c451b82e7b32014627 /OpenKeychain-Test/src/test/java | |
| parent | 2223cdd4056341576a540b065bcb34a1e579b141 (diff) | |
| parent | ccde6add70ea9b5c559910d42dfb2e0bf79f5989 (diff) | |
| download | open-keychain-9e663237b6dc4880bcdb1c763374c44f9f4416d2.tar.gz open-keychain-9e663237b6dc4880bcdb1c763374c44f9f4416d2.tar.bz2 open-keychain-9e663237b6dc4880bcdb1c763374c44f9f4416d2.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
OpenKeychain/src/main/res/values/strings.xml
Diffstat (limited to 'OpenKeychain-Test/src/test/java')
0 files changed, 0 insertions, 0 deletions