From: Rob Golding <rob@robgolding.com>
Date: Fri, 20 Jan 2017 21:14:03 +0000 (+0000)
Subject: Merge branch 'release/1.1.0' into develop
X-Git-Url: https://git.madduck.net/etc/taskwarrior.git/commitdiff_plain/dbaa652d6c0d37f40d013e0129235b6d50335868?hp=e75e49f86808bf78d12fd8df0aeceab426f947f1

Merge branch 'release/1.1.0' into develop
---

diff --git a/docs/conf.py b/docs/conf.py
index 2da9bac..596f56b 100644
--- 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 2b09f1b..360504e 100644
--- 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