Merge tag '1.1.0' into develop

Massive improvements to documentation and presentation.
manuphatak · Apr 15, 2015 · 4c9ef40 · 4c9ef40
2 parents bdb3a9c + 338f164
commit 4c9ef40
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -12,4 +12,9 @@ History
 1.0.0 (2015-04-13)
 ++++++++++++++++++
 
-* First working version.
+* First working version.
+
+1.1.0 (2015-04-15)
+++++++++++++++++++
+
+* Massive improvement to documentation and presentation.
diff --git a/json_config/__init__.py b/json_config/__init__.py
@@ -17,6 +17,6 @@
 """
 __author__ = 'Manu Phatak'
 __email__ = 'bionikspoon@gmail.com'
-__version__ = '1.0.0'
+__version__ = '1.1.0'
 
 from .configuration import connect