aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-05-29 11:31:48 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-05-29 11:31:48 +0200
commit25d0325c5f9f0afde59a7cb355a759b42602d978 (patch)
treee592da76ba3d04486d778d01d1cdfb36658c8ff3
parent38d8f4be52a08ddf738d73500af0288fea80a4b5 (diff)
parentb7947190206d6906bdd0b1edfcdf927ec14b785f (diff)
downloadopen-keychain-25d0325c5f9f0afde59a7cb355a759b42602d978.tar.gz
open-keychain-25d0325c5f9f0afde59a7cb355a759b42602d978.tar.bz2
open-keychain-25d0325c5f9f0afde59a7cb355a759b42602d978.zip
Merge remote-tracking branch 'origin/development' into development
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 804239e0c..034967278 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -3,8 +3,8 @@
xmlns:tools="http://schemas.android.com/tools"
package="org.sufficientlysecure.keychain"
android:installLocation="auto"
- android:versionCode="32200"
- android:versionName="3.2.2">
+ android:versionCode="32300"
+ android:versionName="3.2.3">
<!--
General remarks