aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain-Test/src/test/java/org/sufficientlysecure
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-12-30 13:09:27 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2014-12-30 13:09:27 +0100
commit9e663237b6dc4880bcdb1c763374c44f9f4416d2 (patch)
tree3c317cf8a9e320db0b6ff5c451b82e7b32014627 /OpenKeychain-Test/src/test/java/org/sufficientlysecure
parent2223cdd4056341576a540b065bcb34a1e579b141 (diff)
parentccde6add70ea9b5c559910d42dfb2e0bf79f5989 (diff)
downloadopen-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/org/sufficientlysecure')
0 files changed, 0 insertions, 0 deletions