Merge branch 'master' into dev

This commit is contained in:
tgstation-server
2020-05-25 03:37:24 +00:00
+1 -1
View File
@@ -4,7 +4,7 @@
<!-- Integration tests will ensure they match across the board -->
<TgsCoreVersion>4.2.6</TgsCoreVersion>
<TgsApiVersion>6.4.1</TgsApiVersion>
<TgsClientVersion>7.0.0</TgsClientVersion>
<TgsClientVersion>7.0.1</TgsClientVersion>
<TgsDmapiVersion>5.2.1</TgsDmapiVersion>
<TgsControlPanelVersion>0.4.0</TgsControlPanelVersion>
<TgsHostWatchdogVersion>1.1.0</TgsHostWatchdogVersion>