Merge tag '2.9' into develop

2.9
uw-dims · Sep 20, 2016 · 0405b3a · 0405b3a
2 parents 49742ab + 5cf4355
commit 0405b3a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.6.2
+current_version = 2.9.0
 commit = True
 tag = False
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.6.2
+2.9.0
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '2.6.2'
+version = '2.9.0'
 # The full version, including alpha/beta/rc tags.
-release = '2.6.2'
+release = '2.9.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.