From 5d522fbad66b8b89e8983ec9566e4aea2d9539d6 Mon Sep 17 00:00:00 2001
From: timmartin19 <tim.martin@vertical-knowledge.com>
Date: Sun, 22 Nov 2015 20:47:06 -0500
Subject: [PATCH] Preparing release 1.1.0

---
 CHANGELOG.rst | 2 +-
 setup.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 843b215..affb9c0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-1.0.1 (unreleased)
+1.1.0 (2015-11-22)
 ==================
 
 - Added Easy Resources which allow a user to easily create resources from django models
diff --git a/setup.py b/setup.py
index 3f749e2..e061e8f 100644
--- a/setup.py
+++ b/setup.py
@@ -7,7 +7,7 @@
 
 from setuptools import setup
 
-version = '1.0.1.dev0'
+version = '1.1.0'
 
 setup(
     author=__author__,