cthrace/open-keychain
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into yubikey

Browse Source 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle
This commit is contained in:
Dominik Schürmann committed 2014-08-06 01:08:12 +02:00
2 parents 0bfac9989f 6ba7536838
commit 881a50207a
207 files changed
+4788 -5293
Download Patch File Download Diff File Expand all files Collapse all files