moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-15 14:40:15 -05:00
Code Issues Releases Wiki Activity
fc2a1f5838
open-keychain/OpenKeychain/src
History
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
..
main Merge branch 'master' into improve-file-more 2014-08-01 05:29:40 +02:00