Merge branch 'master' into combobreak

This commit is contained in:
welsar55
2019-06-29 11:55:10 -05:00
committed by GitHub
255 changed files with 11262 additions and 2484 deletions

View File

@ -15,7 +15,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.4" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2019.627.0" />
<PackageReference Include="ppy.osu.Framework" Version="2019.618.0" />
<PackageReference Include="ppy.osu.Framework" Version="2019.628.0" />
<PackageReference Include="SharpCompress" Version="0.23.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="SharpRaven" Version="2.4.0" />