aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorTim Bray <tbray@textuality.com>2014-11-19 14:37:06 -0800
committerTim Bray <tbray@textuality.com>2014-11-19 14:37:06 -0800
commit629d83a1ceedefe42f6e763af2065033f3fe77ae (patch)
treeb2f8ecd92f86e26dbd3c221ed796673e918e5e77 /OpenKeychain
parentb5cdeb7f5a54be7443894ca2cb4bd27359fae9ce (diff)
parent1c0f994d082bde6d6b0a6783e8d81a1d80d86a23 (diff)
downloadopen-keychain-629d83a1ceedefe42f6e763af2065033f3fe77ae.tar.gz
open-keychain-629d83a1ceedefe42f6e763af2065033f3fe77ae.tar.bz2
open-keychain-629d83a1ceedefe42f6e763af2065033f3fe77ae.zip
Merge branch 'keybase-proofs' of https://github.com/open-keychain/open-keychain into keybase-proofs
Diffstat (limited to 'OpenKeychain')
-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 18fcc4b42..3af0bdf6c 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="31200"
- android:versionName="3.1.2">
+ android:versionCode="31201"
+ android:versionName="3.2beta1">
<!--
General remarks