aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Tardieu <sam@rfc1149.net>2014-07-24 21:31:38 +0200
committerSamuel Tardieu <sam@rfc1149.net>2014-07-24 21:31:38 +0200
commit8c6bd64cdc405ba9966a816d498734a4544bdaa7 (patch)
tree821a622188d7587c57d9d40dfb748af47a771fa9
parent2cdcbdd070fa5a7a6001fd40cb92fdccbd4096a5 (diff)
parentf92c979a14653319e3dd6abb1ad95a2b0f31ae94 (diff)
downloadcgeo-8c6bd64cdc405ba9966a816d498734a4544bdaa7.zip
cgeo-8c6bd64cdc405ba9966a816d498734a4544bdaa7.tar.gz
cgeo-8c6bd64cdc405ba9966a816d498734a4544bdaa7.tar.bz2
Merge branch 'release' into upstream
-rw-r--r--main/res/values/changelog_release.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/main/res/values/changelog_release.xml b/main/res/values/changelog_release.xml
index 80d362b..3c8dd06 100644
--- a/main/res/values/changelog_release.xml
+++ b/main/res/values/changelog_release.xml
@@ -2,6 +2,11 @@
<resources>
<!-- changelog for the release branch -->
<string name="changelog_release" translatable="false">\n
+ <b>Next bugfix release:</b>\n
+ · Fix: Slow login on gc.com\n
+ · Fix: Usernames with &lt; or &gt; have not been able to login\n
+ · Fix: Support mails sent from cgeo will contain version info in subject\n
+ \n
<b>2014.07.18:</b>\n
· Fix: Allegedly only \"unpublished\" caches for some users on some mobile networks\n
\n