Merge remote-tracking branch 'upstream/master' into url-parsing-support

This commit is contained in:
Dean Herbert 2018-01-29 12:55:32 +09:00
commit 2b14438fe4
1 changed files with 1 additions and 1 deletions

View File

@ -275,7 +275,7 @@
<Compile Include="Graphics\Textures\LargeTextureStore.cs" />
<Compile Include="Online\API\Requests\GetUserRequest.cs" />
<Compile Include="Migrations\20180125143340_Settings.cs" />
<Compile Include="Migrations\20180125143340_Settings.designer.cs">
<Compile Include="Migrations\20180125143340_Settings.Designer.cs">
<DependentUpon>20180125143340_Settings.cs</DependentUpon>
</Compile>
<Compile Include="Overlays\Profile\SupporterIcon.cs" />