moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-10 11:05:06 -05:00
Code Issues Releases Wiki Activity
520f9abea3
open-keychain/OpenKeychain/src/main/java/org
History
Dominik Schürmann 520f9abea3 Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
2015-05-04 14:42:21 +02:00
..
spongycastle/openpgp/operator/jcajce fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) 2015-04-01 00:39:32 +02:00
sufficientlysecure/keychain Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development 2015-05-04 14:42:21 +02:00