moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-05 08:45:08 -05:00
Code Issues Releases Wiki Activity
0e152d1db0
open-keychain/OpenKeychain
History
Dominik Schürmann 0e152d1db0 Merge branch 'master' of github.com:open-keychain/open-keychain 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2014-08-20 19:48:19 +02:00
..
src/main Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 19:48:19 +02:00
.gitignore Fix gitignore for lint 2014-04-09 16:36:28 +02:00
build.gradle Fixing lint complaints, removing unused resources 2014-08-04 16:29:16 +02:00