Files
open-keychain/OpenKeychain/src/main/res/layout
mar-v-in eae7c711a3 Merge branch 'master' into improve-file-more
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
2014-07-31 23:19:01 +02:00
..
2014-07-30 15:19:33 +02:00
2014-07-02 18:59:23 +02:00
2014-07-08 03:37:32 +02:00
2014-06-30 22:01:17 +02:00
2014-07-30 14:59:12 +02:00
2014-07-28 11:11:23 +02:00
2014-07-27 21:40:43 +02:00
2014-04-11 16:00:37 +02:00