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

Rename folder structure from OpenPGP Keychain to OpenKeychain

2014-04-06 12:57:42 +02:00

OpenPgpService.java

Merge branch 'master' into yubikey

2014-08-01 11:09:25 +02:00

RemoteService.java

Remove unused blob classes and other dead code

2014-04-13 17:46:39 +02:00