Merge branch 'master' into settingsitem-getboundcopy

This commit is contained in:
Dean Herbert
2017-10-30 16:20:39 +09:00
committed by GitHub

View File

@ -288,7 +288,7 @@
<DependentUpon>20171019041408_InitialCreate.cs</DependentUpon> <DependentUpon>20171019041408_InitialCreate.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Migrations\20171025071459_AddMissingIndexRules.cs" /> <Compile Include="Migrations\20171025071459_AddMissingIndexRules.cs" />
<Compile Include="Migrations\20171025071459_AddMissingIndexRules.designer.cs"> <Compile Include="Migrations\20171025071459_AddMissingIndexRules.Designer.cs">
<DependentUpon>20171025071459_AddMissingIndexRules.cs</DependentUpon> <DependentUpon>20171025071459_AddMissingIndexRules.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Migrations\OsuDbContextModelSnapshot.cs" /> <Compile Include="Migrations\OsuDbContextModelSnapshot.cs" />