Merge branch 'release-2.5' into develop

2016-07-14 00:43:25 +03:00 · 2016-07-14 00:43:25 +03:00 · 31fd9e6c04
parent a3b14de0f5 29cdd7f3dc
commit 31fd9e6c04
1 changed files with 1 additions and 1 deletions
--- a/setup.py
+++ b/setup.py
@ -59,7 +59,7 @@ else:


 def get_version():
-	base_version = '2.4'
+	base_version = '2.5'
 	base_version += '.dev9999'
 	try:
 		return base_version + '+git.' + str(subprocess.check_output(['git', 'rev-parse', 'HEAD']).strip())