Dominik Schürmann efa5a80eb6 Merge branch 'development' of github.com:open-keychain/open-keychain into development ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java

2014-10-23 23:33:50 +02:00

..

src/main

Merge branch 'development' of github.com:open-keychain/open-keychain into development

2014-10-23 23:33:50 +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