revert [52042]

svn path=/plone.app.discussion/trunk/; revision=52045
2011-09-16 13:46:02 +00:00 · 2011-09-16 13:46:02 +00:00 · 0c0896f0b2
parent 0153573d4d
commit 0c0896f0b2
2 changed files with 9 additions and 3 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -1,11 +1,17 @@
 Changelog
 =========

-2.1.1 (2011-09-16)
+2.1.1 (unreleased)
 ------------------

- Nothing changed yet.
+- Fix control panel help text typos
+  [jonstahl]

+- Documentation about overriding the comments viewlet js added.
+  [timo]
+
+- Corrected location of Japanese po file.
+  [tyam]

 2.1.0 (unreleased)
 ------------------
--- a/setup.py
+++ b/setup.py
@ -1,6 +1,6 @@
 from setuptools import setup, find_packages

-version = '2.1.1'
+version = '2.1.1dev'

 install_requires = [
    'setuptools',