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

..

src

Merge branch 'master' into mime4j

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

.gitignore

…

build.gradle

Merge branch 'master' into mime4j

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

proguard-rules.pro

Add dontnote to proguard

2015-05-10 10:44:04 +02:00