Merge pull request #5087 from yakky/merge/3.2.3

Merge 3.2.3 in develop
django-cms · Mar 17, 2016 · d04f1e2 · d04f1e2
2 parents cb71123 + 29a1da8
commit d04f1e2
Show file tree

Hide file tree

Showing 10 changed files with 443 additions and 494 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -5,6 +5,10 @@
 * Refactor language menu to allow for better integration with many languages
 * Management commands has been completely refactored for better consistency
 
+=== 3.2.3 (2016-03-09) ===
+
+- Fix the display of hyphenated language codes in the page tree
+- Fix a family of issues relating to unescaped translations in the page tree
 
 
 === 3.2.2 (2016-03-02) ===

diff --git a/cms/__init__.py b/cms/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 
-__version__ = '3.3.0.dev3'
+__version__ = '3.3.0.dev4'
 
 default_app_config = 'cms.apps.CMSConfig'