Merge remote-tracking branch 'ppy/master' into skinning-basics

This commit is contained in:
Dean Herbert 2018-02-24 22:41:17 +09:00
commit a312fb365a

View File

@ -323,7 +323,7 @@
<DependentUpon>20171209034410_AddRulesetInfoShortName.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\20180219060912_AddSkins.cs" />
<Compile Include="Migrations\20180219060912_AddSkins.designer.cs">
<Compile Include="Migrations\20180219060912_AddSkins.Designer.cs">
<DependentUpon>20180219060912_AddSkins.cs</DependentUpon>
</Compile>
<Compile Include="Migrations\OsuDbContextModelSnapshot.cs" />