PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity
open-keychain/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote
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
..
ui Merge branch 'master' into yubikey 2014-08-06 01:08:12 +02:00
AccountSettings.java Use CompressionAlgorithmTags instead of homebrew constants 2014-08-05 23:50:59 +02:00
AppSettings.java
OpenPgpService.java Merge branch 'master' into yubikey 2014-08-01 11:09:25 +02:00
RemoteService.java