moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 00:18:51 -05:00
Code Issues Releases Wiki Activity
cae0071342
open-keychain/OpenKeychain
History
mar-v-in cae0071342 Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2014-06-04 21:32:37 +02:00
..
src Merge branch 'master' into automatic-contact-discovery 2014-06-04 21:32:37 +02:00
.gitignore Fix gitignore for lint 2014-04-09 16:36:28 +02:00
build.gradle Merge branch 'master' into automatic-contact-discovery 2014-06-04 21:32:37 +02:00