Merge branch 'release/v1.33.2' into development

Conflicts: config.py
2017-11-22 21:51:19 -05:00
parent 25df05a15d 065747f425
commit d45d7204d2
4 changed files with 7 additions and 11 deletions
--- a/config.py
+++ b/config.py
@@ -19,10 +19,10 @@ debug = False
 saveInRoot = False

 # Version data
-version = "1.33.2"
+version = "1.33.3   "
 tag = "git"
 expansionName = "Lifeblood"
-expansionVersion = "1.0"
+expansionVersion = "1.7"
 evemonMinVersion = "4081"

 pyfaPath = None