From 21d41100df312b47841307661efe499c62c7e8aa Mon Sep 17 00:00:00 2001
From: Diederik van der Boor <vdboor@edoburu.nl>
Date: Mon, 1 May 2017 12:35:47 +0200
Subject: [PATCH] Bump to v1.2 for Django 1.11 support

---
 docs/changelog.rst      | 10 ++++++++++
 docs/conf.py            |  4 ++--
 polymorphic/__init__.py |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 4f2fb2f..23cd77d 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,16 @@
 Changelog
 =========
 
+Version 1.2 (2017-05-01)
+------------------------
+
+* Django 1.11 support.
+* Fixed ``PolymorphicInlineModelAdmin`` to explictly exclude ``polymorphic_ctype``.
+* Fixed Python 3 TypeError in the admin when preserving the query string.
+* Fixed Python 3 issue due to ``force_unicode()`` usage instead of ``force_text()``.
+* Fixed ``z-index`` attribute for admin menu appearance.
+
+
 Version 1.1 (2017-02-03)
 ------------------------
 
diff --git a/docs/conf.py b/docs/conf.py
index 8ae26d3..5221d1b 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -62,9 +62,9 @@ copyright = u'2013, Bert Constantin, Chris Glass, Diederik van der Boor'
 # built documents.
 #
 # The short X.Y version.
-version = '1.1'
+version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.1'
+release = '1.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/polymorphic/__init__.py b/polymorphic/__init__.py
index 1a2fdc0..6e75907 100644
--- a/polymorphic/__init__.py
+++ b/polymorphic/__init__.py
@@ -9,7 +9,7 @@ Please see LICENSE and AUTHORS for more information.
 import django
 
 # See PEP 440 (https://www.python.org/dev/peps/pep-0440/)
-__version__ = "1.1"
+__version__ = "1.2"
 
 
 # Monkey-patch Django < 1.5 to allow ContentTypes for proxy models.