Merge branch 'staging' into jenkins

This commit is contained in:
Westin Miller
2017-08-23 03:02:26 -07:00
10 changed files with 257 additions and 6 deletions

View File

@@ -182,6 +182,8 @@
</Compile>
<Compile Include="ServerState.cs" />
<Compile Include="ModAPI\TorchAPI.cs" />
<Compile Include="Session\ITorchSession.cs" />
<Compile Include="Session\ITorchSessionManager.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />