Merge master with conflicts resolved

This commit is contained in:
Andrei Zavatski
2020-01-30 10:39:23 +03:00
27 changed files with 201 additions and 144 deletions

View File

@ -29,7 +29,7 @@ namespace osu.Game.Tests.Visual.Online
};
[Cached]
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Green);
private readonly OverlayColourProvider colourProvider = new OverlayColourProvider(OverlayColourScheme.Pink);
public TestSceneHistoricalSection()
{