Dominik Schürmann 43b8170a44 Merge branch 'master' of github.com:open-keychain/open-keychain ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java

2014-07-30 00:58:28 +02:00

..

src/main

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

2014-07-30 00:58:28 +02:00

.gitignore

Fix gitignore for lint

2014-04-09 16:36:28 +02:00

build.gradle

Merge branch 'master' into ditch-appmsg

2014-07-26 23:06:32 +02:00