moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-08-13 15:53:53 -04:00
Code Issues Releases Wiki Activity
23b8e8272c
open-keychain/OpenKeychain/src/main/java/org
History
Dominik Schürmann 23b8e8272c Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyInputFragment.java
2015-03-05 23:29:43 +01:00
..
spongycastle/openpgp/operator/jcajce Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate 2014-09-24 02:01:53 +02:00
sufficientlysecure/keychain Merge branch 'issue1050' of https://github.com/lezorich/open-keychain into passphrase-strength-indicator 2015-03-05 23:29:43 +01:00