Bump to v1.2

arthanson · May 1, 2017 · 8dea608 · 8dea608
1 parent 6d85f6b
commit 8dea608
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+Changes in 1.2 (2017-05-01)
+---------------------------
+
+* Django 1.11 support.
+* Fixd garbled placeholder data in admin forms submitted with errors
+* Fixed JavaScript ``django_wysiwyg`` error when text plugin is not included.
+* Dropped Django 1.5, 1.6 and Python 2.6 support.
+
+
 Changes in 1.1.11 (2016-12-21)
 ------------------------------
 

diff --git a/docs/conf.py b/docs/conf.py
@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.1.11'
+version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.1.11'
+release = '1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/fluent_contents/__init__.py b/fluent_contents/__init__.py
@@ -1,2 +1,2 @@
 # following PEP 440
-__version__ = "1.1.11"
+__version__ = "1.2"