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
5564f65a69
open-keychain/OpenKeychain/src/main/java/org
History
Dominik Schürmann 5564f65a69 Merge remote-tracking branch 'origin/t/snackbar' into development 
Conflicts:
	OpenKeychain/build.gradle
2015-01-29 09:55:09 +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 remote-tracking branch 'origin/t/snackbar' into development 2015-01-29 09:55:09 +01:00