Merge branch 'master' into 2.0

This commit is contained in:
Julien Duponchelle committed 2017-03-13 15:42:58 +01:00
commit 5e2b619305
2 files changed
+9 -1

No files matched your search

+1 -1
View File
@@ -23,7 +23,7 @@
# or negative for a release candidate or beta (after the base version
# number has been incremented)
__version__ = "2.0.0rc2"
__version__ = "2.0.0dev11"
# If it's a git checkout try to add the commit
if "dev" in __version__: