Vincent Breitmoser 3814ae7d53 Merge branch 'master' into mime4j ...

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
	OpenKeychain/src/main/res/values/strings.xml

2015-09-14 16:21:04 +02:00

..

compatibility

Rudimentary backup feature

2015-07-08 13:25:07 +02:00

keyimport

introduced constants for keyserver sync, fixed sync issue

2015-08-20 21:02:29 +05:30

linked

linked: deprecate unused method, for now

2015-09-10 12:12:35 +02:00

operations

Merge branch 'master' into mime4j

2015-09-14 16:21:04 +02:00

pgp

strip encrypted filenames to basenames (OKC-01-004)

2015-09-11 03:30:10 +02:00

provider

sort confirmed keys before unconfirmed primary ones (OKC-01-011)

2015-09-11 03:56:07 +02:00

remote

Fixes open-keychain/open-keychain#1515

2015-09-03 13:25:09 -04:00

service

Merge branch 'master' into mime4j

2015-09-14 16:21:04 +02:00

ui

Merge branch 'master' into mime4j

2015-09-14 16:21:04 +02:00

util

Merge branch 'linked-identities' (and fix OperationHelper ids)

2015-08-29 13:28:56 +02:00

Constants.java

Make keybase an experimental feature

2015-08-28 15:18:11 +02:00

KeychainApplication.java

introduced constants for keyserver sync, fixed sync issue

2015-08-20 21:02:29 +05:30