Dominik Schürmann ef7eab2c8b Merge branch 'master' of github.com:open-keychain/open-keychain ... Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java		2014-10-03 02:20:38 +02:00
..
src/main	Merge branch 'master' of github.com:open-keychain/open-keychain	2014-10-03 02:20:38 +02:00
.gitignore	Fix gitignore for lint	2014-04-09 16:36:28 +02:00
build.gradle	Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate	2014-09-24 02:01:53 +02:00