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

..

android-icon-copier

if needed change name options.templ.json

2015-03-03 12:30:56 -08:00

drawables

Merge tag 'v3.2.1' into linked-identities

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

screenshots

Add screenshots

2015-05-06 14:22:53 +02:00

get-material-icons.sh

Put decrypt result in toolbar, some ui fixes for decrypt

2015-04-26 00:33:26 +02:00

update-drawables.sh

Merge branch 'development' into linked-identities

2015-04-24 14:18:01 +02:00