Merge branch 'master' into dev
This commit is contained in:
commit
4778ec4f94
1 file changed
+1
@@ -3,6 +3,7 @@
|
||||
MAJOR_VERSION = 0
|
||||
MINOR_VERSION = 36
|
||||
PATCH_VERSION = '0.dev0'
|
||||
>>>>>>> master
|
||||
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
|
||||
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
|
||||
REQUIRED_PYTHON_VER = (3, 4, 2)
|
||||
|
||||
Reference in new issue
Block a user