Merge branch 'master' into development

Conflicts:
	config.py
This commit is contained in:
blitzmann
2017-06-25 01:23:08 -04:00
5 changed files with 21 additions and 5 deletions

View File

@@ -19,7 +19,7 @@ debug = False
saveInRoot = False
# Version data
version = "1.29.4"
version = "1.29.5"
tag = "git"
expansionName = "YC119.5"
expansionVersion = "1.0"