Vincent Breitmoser 20a6c5ce8a Merge tag 'v3.2.1' into linked-identities ...

Version 3.2.1

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml

2015-05-11 17:28:34 +02:00

..

src

Merge tag 'v3.2.1' into linked-identities

2015-05-11 17:28:34 +02:00

.gitignore

Fix gitignore for lint

2014-04-09 16:36:28 +02:00

build.gradle

Merge tag 'v3.2.1' into linked-identities

2015-05-11 17:28:34 +02:00

proguard-rules.pro

Add dontnote to proguard

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