Merge branch 'dev'

# Conflicts: # docs/features.rst # requirements.txt
tethysplatform · May 29, 2015 · 7b39d8b · 7b39d8b
2 parents d8fe5b5 + 4ff9c00
commit 7b39d8b
Show file tree

Hide file tree

Showing 1,371 changed files with 227,541 additions and 1,645 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -51,9 +51,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1'
+version = '1.1'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.0'
+release = '1.1.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/docs/development/docker_env.rst b/docs/development/docker_env.rst