aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2014-10-26 22:01:00 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2014-10-26 22:01:00 +0100
commit35c80ed429cbc4b4d920adf8161425efa09dece2 (patch)
treed712de1602e12ee45f7acf040ca67bc5814d15ac /OpenKeychain
parent082722a3cfbae408ae3df1f27b191c62a212ff2b (diff)
parent4aed570ee3e0301b04721363a91542292c5258cb (diff)
downloadopen-keychain-35c80ed429cbc4b4d920adf8161425efa09dece2.tar.gz
open-keychain-35c80ed429cbc4b4d920adf8161425efa09dece2.tar.bz2
open-keychain-35c80ed429cbc4b4d920adf8161425efa09dece2.zip
Merge branch 'development' of github.com:open-keychain/open-keychain into development
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 af5bd9e02..74dc05016 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="30100"
- android:versionName="3.0.1">
+ android:versionCode="30101"
+ android:versionName="3.1beta1">
<!--
General remarks