moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-17 22:35:05 -05:00
Code Issues Releases Wiki Activity
734a085f0d
open-keychain/OpenKeychain/src/main/java/org
History
Tim Bray 734a085f0d Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
2014-11-21 19:45:35 -08: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 remote-tracking branch 'origin/keybase-proofs' into keybase-proofs 2014-11-21 19:45:35 -08:00