mar-v-in fc2a1f5838 Merge branch 'master' into improve-file-more ...

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java

2014-08-01 05:29:40 +02:00

..

src/main

Merge branch 'master' into improve-file-more

2014-08-01 05:29:40 +02:00

.gitignore

Fix gitignore for lint

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

build.gradle

Merge branch 'master' into improve-file-more

2014-07-31 23:19:01 +02:00