Vincent Breitmoser 340ed7c08d Merge remote-tracking branch 'origin/master' into development		2014-10-09 16:25:53 +02:00
..
src/main	Merge remote-tracking branch 'origin/master' into development	2014-10-09 16:25:53 +02:00
.gitignore
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