Merge remote-tracking branch 'origin/development' into development

This commit is contained in:
Vincent Breitmoser 2015-05-29 11:31:48 +02:00
commit 25d0325c5f

View File

@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="org.sufficientlysecure.keychain" package="org.sufficientlysecure.keychain"
android:installLocation="auto" android:installLocation="auto"
android:versionCode="32200" android:versionCode="32300"
android:versionName="3.2.2"> android:versionName="3.2.3">
<!-- <!--
General remarks General remarks