cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
eae7c711a3f588a24ef621a8b82bcd793bcb7e70
open-keychain/OpenKeychain/src/main
History
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
..
assets
remove leftover of AndroidBootstrap
2014-06-30 22:05:02 +02:00
java
Merge branch 'master' into improve-file-more
2014-07-31 23:19:01 +02:00
res
Merge branch 'master' into improve-file-more
2014-07-31 23:19:01 +02:00
AndroidManifest.xml
Merge branch 'master' into improve-file-more
2014-07-31 23:19:01 +02:00