aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--OpenKeychain/src/main/AndroidManifest.xml4
-rw-r--r--OpenKeychain/src/main/res/raw/help_changelog.html5
3 files changed, 10 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f6b914fbf..a4235113d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+2.6.1
+* some fixes for regression bugs
+
2.6
* key certifications (thanks to Vincent Breitmoser)
* support for GnuPG partial secret keys (thanks to Vincent Breitmoser)
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 9cd3a8127..caefafb54 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="26000"
- android:versionName="2.6">
+ android:versionCode="26100"
+ android:versionName="2.6.1">
<!--
General remarks
diff --git a/OpenKeychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html
index 2078df57f..dd3c0e81a 100644
--- a/OpenKeychain/src/main/res/raw/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw/help_changelog.html
@@ -5,6 +5,11 @@ And don't add newlines before or after p tags because of transifex -->
<head>
</head>
<body>
+<h2>2.6.1</h2>
+<ul>
+<li>some fixes for regression bugs</li>
+</ul>
+
<h2>2.6</h2>
<ul>
<li>key certifications (thanks to Vincent Breitmoser)</li>