Merge branch 'release/1.1.0' into develop

diff --git a/docs/conf.py b/docs/conf.py
index 2da9bacca98ccdc360546bd182206e7749a05b4a..596f56b0653d467c65dec0196c43defc6eb3433f 100644 (file)
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -51,9 +51,9 @@ copyright = u'2014, Rob Golding'
 # built documents.
 #
 # The short X.Y version.
-version = '1.0.0'
+version = '1.1.0'
 # The full version, including alpha/beta/rc tags.
-release = '1.0.0'
+release = '1.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
index 2b09f1b20f16f0ee0721ce5052f1ae47861a885e..360504e12a2700ccf499c9ae87d80e801838cc1e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 install_requirements = ['six>=1.4', 'pytz', 'tzlocal']
 
-version = '1.0.0'
+version = '1.1.0'
 
 try:
     import importlib