moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-06 17:25:05 -05:00
Code Issues Releases Wiki Activity
a9c9b6132c
open-keychain/OpenPGP-Keychain
History
Vincent Breitmoser a9c9b6132c Merge branch 'master' into certs 
Conflicts:
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
	OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
2014-03-12 23:45:21 +01:00
..
src/main Merge branch 'master' into certs 2014-03-12 23:45:21 +01:00
.gitignore New Gradle project structure 2014-01-27 14:18:25 +01:00
build.gradle Revert "Lint changes" 2014-03-10 18:23:47 +01:00