open-keychain/OpenKeychain
Dominik Schürmann af5fc66229 Merge pull request #1317 from adithyaphilip/master
Merge key from Keyserver with that from Keybase instead of replacing
2015-06-01 10:15:46 +02:00
..
src Merge pull request #1317 from adithyaphilip/master 2015-06-01 10:15:46 +02:00
.gitignore
build.gradle Workaround for Samsung Android 4.2 bug 2015-05-10 04:58:44 +02:00
proguard-rules.pro Add dontnote to proguard 2015-05-10 10:44:04 +02:00