Merge branch 'master' into test-3

2018-02-14 22:07:33 -05:00
parent 23f0f48c80 0e93136157
commit c6e715aa5c
35 changed files with 116 additions and 29 deletions
--- a/config.py
+++ b/config.py
@@ -20,10 +20,10 @@ debug = False
 saveInRoot = False

 # Version data
-version = "1.34.0"
+version = "1.35.0"
 tag = "Stable"
-expansionName = " Arms Race"
-expansionVersion = "1.3"
+expansionName = "YC120.2"
+expansionVersion = "1.1"
 evemonMinVersion = "4081"

 pyfaPath = None