summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Weiske <cweiske@cweiske.de>2011-02-15 07:56:20 +0100
committerChristian Weiske <cweiske@cweiske.de>2011-02-15 07:56:20 +0100
commit96f7172de0123a92cd635f6d8c38d267b73749c7 (patch)
treecf0aa841c165ee10c22fa176b5ccf1ab0ec76c6c
parenta46146d01605624e8d8f040699f7c70f92c04773 (diff)
downloadsemanticscuttle-96f7172de0123a92cd635f6d8c38d267b73749c7.tar.gz
semanticscuttle-96f7172de0123a92cd635f6d8c38d267b73749c7.tar.bz2
move changes into 0.97.2 where I merged them
-rw-r--r--doc/ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/ChangeLog b/doc/ChangeLog
index ee74bc9..2fa0f20 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -5,8 +5,6 @@ ChangeLog for SemantiScuttle
-------------------
- Fix bug in getTagsForBookmarks() that fetched all tags
- Fix bug #3073215: Updating bookmark time does not work
-- Fix bug #3074816: French translation breaks edit javascript
-- Fix bug #3111254: Search in my_watchlist results in error
- Show error message on mysqli connection errors
- Implement patch #3059829: update FR_CA translation
- Update php-gettext library to 1.0.10
@@ -16,6 +14,8 @@ ChangeLog for SemantiScuttle
0.97.2 - 2011-02-XX
-------------------
- Fix bug #3178597: Broken link to context in gsearch admin index page
+- Fix bug #3074816: French translation breaks edit javascript
+- Fix bug #3111254: Search in my_watchlist results in error
0.97.1 - 2010-09-30