Dominik Schürmann 47caad3edb Merge branch 'development' into keybase-proofs		2014-11-21 23:55:17 +01:00
..
src/main	Merge branch 'development' into keybase-proofs	2014-11-21 23:55:17 +01: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