From c1411c49055744a157e6e170caeb152bb10e3ea8 Mon Sep 17 00:00:00 2001
From: James Socol <me@jamessocol.com>
Date: Tue, 29 Aug 2017 09:28:42 -0400
Subject: [PATCH] Version 1.1.0

---
 CHANGELOG            | 8 ++++++++
 jsonview/__init__.py | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0eb4e22..ca8e05e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,14 @@
 Changelog
 =========
 
+v1.1.0
+------
+
+- Add `JSON_DEFAULT_CONTENT_TYPE` setting
+- Update compatibility/test for Django 1.8, 1.10, 1.11.
+- Fix issue #36 mutating settings.
+
+
 v1.0.0
 ------
 
diff --git a/jsonview/__init__.py b/jsonview/__init__.py
index bc8219a..c0ef4db 100644
--- a/jsonview/__init__.py
+++ b/jsonview/__init__.py
@@ -1,2 +1,2 @@
-VERSION = (1, 0, 0)
+VERSION = (1, 1, 0)
 __version__ = '.'.join(map(str, VERSION))