Merge branch 'master' into gh-pages

This commit is contained in:
Aktanusa committed 2019-04-01 13:34:41 -04:00
commit 0ea8719dbf
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -2928,7 +2928,7 @@ CM.ConfigDefault = {
}; };
CM.ConfigPrefix = 'CMConfig'; CM.ConfigPrefix = 'CMConfig';
CM.VersionMajor = '2.018'; CM.VersionMajor = '2.019';
CM.VersionMinor = '1'; CM.VersionMinor = '1';
/******* /*******
+1 -1
View File
@@ -292,6 +292,6 @@ CM.ConfigDefault = {
}; };
CM.ConfigPrefix = 'CMConfig'; CM.ConfigPrefix = 'CMConfig';
CM.VersionMajor = '2.018'; CM.VersionMajor = '2.019';
CM.VersionMinor = '1'; CM.VersionMinor = '1';