moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-19 22:02:16 -05:00
Code Issues Releases Wiki Activity
734a085f0d
open-keychain/OpenKeychain/src/main/java
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
..
android/support/v4/widget Hack to disable overscroll effect of swipe to update 2014-09-13 23:08:04 +02:00
org Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofs 2014-11-21 19:45:35 -08:00