Merge remote-tracking branch 'upstream/general-devel' into regions

This commit is contained in:
Ivan 2018-04-29 18:39:12 +02:00
commit 44dfc570ab
9 changed files with 20 additions and 362 deletions

View file

@ -145,7 +145,6 @@
<Compile Include="Rest\RestVerbs.cs" />
<Compile Include="Rest\SecureRest.cs" />
<Compile Include="ServerSideCharacters\ServerSideConfig.cs" />
<Compile Include="StatTracker.cs" />
<Compile Include="TSServerPlayer.cs" />
<Compile Include="Utils.cs" />
<Compile Include="TShock.cs" />