aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-05-08 19:32:07 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-05-08 19:32:07 +0200
commitbadfa9f7bc13bdf2b239b8be331de3637e55be2e (patch)
tree13430f00e3bd449aa3aa7d28fd1a4c3b718d4eb5
parentc2b75e3d2e6097a9566a022500b47d6749b13ef7 (diff)
downloadopen-keychain-badfa9f7bc13bdf2b239b8be331de3637e55be2e.tar.gz
open-keychain-badfa9f7bc13bdf2b239b8be331de3637e55be2e.tar.bz2
open-keychain-badfa9f7bc13bdf2b239b8be331de3637e55be2e.zip
Changelog 2.7
-rw-r--r--CHANGELOG7
-rw-r--r--OpenKeychain/src/main/res/raw/help_changelog.html9
2 files changed, 16 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index a4235113d..893082aa4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+2.7
+* Purple! (Dominik, Vincent)
+* New key view design (Dominik, Vincent)
+* New flat Android buttons (Dominik, Vincent)
+* API fixes (Dominik)
+* Keybase.io import (Tim Bray)
+
2.6.1
* some fixes for regression bugs
diff --git a/OpenKeychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html
index dd3c0e81a..779aa696f 100644
--- a/OpenKeychain/src/main/res/raw/help_changelog.html
+++ b/OpenKeychain/src/main/res/raw/help_changelog.html
@@ -5,6 +5,15 @@ And don't add newlines before or after p tags because of transifex -->
<head>
</head>
<body>
+<h2>2.7</h2>
+<ul>
+<li>Purple! (Dominik, Vincent)</li>
+<li>New key view design (Dominik, Vincent)</li>
+<li>New flat Android buttons (Dominik, Vincent)</li>
+<li>API fixes (Dominik)</li>
+<li>Keybase.io import (Tim Bray)</li>
+</ul>
+
<h2>2.6.1</h2>
<ul>
<li>some fixes for regression bugs</li>