Vincent Breitmoser 20a6c5ce8a Version 3.2.1 ...

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVTz9/AAoJEHGMBwEAASKCRxoH/0IqEXg79Hu2Q+XHzfxNl01W
 ork+6qHRG6AaKaYv5xEgj2CFwG/HSpVGbTR+3ahn28d9UMgh05vSRR2Jh2qkSMCb
 owEVMlHopQkWKqLEsXcbkdMQxDqdVTUeLJcldxR2+B7CM1orZr6VLSU6rDVvHLq1
 kPBAsk74cNg8svjfRFC4GdveWGNOnhUY267kVi7TFOhOIhX2ujbfY1ovJK7Zt5Ft
 qCg2/TY2tWDZUkJ3RIhwrBVUo6lvMNZ5r0cjkualBOe3qNZqejXt6IwEjZZR9vLA
 YkICjSF6DaLpTR97WucMKN2zqe4Gv4jWhYP4q+2OqrbJSUwbqxAsTahlyQXxht4=
 =YRwH
 -----END PGP SIGNATURE-----

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

Version 3.2.1

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