moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-23 17:22:16 -05:00
Code Issues Releases Wiki Activity
881a50207a
open-keychain/OpenKeychain
History
Dominik Schürmann 881a50207a Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle
2014-08-06 01:08:12 +02:00
..
src/main Merge branch 'master' into yubikey 2014-08-06 01:08:12 +02:00
.gitignore Fix gitignore for lint 2014-04-09 16:36:28 +02:00
build.gradle Merge branch 'master' into yubikey 2014-08-06 01:08:12 +02:00