smoogipoo 4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs # osu.Game/Screens/Menu/Intro.cs # osu.Game/Screens/Menu/MenuSideFlashes.cs		2018-06-06 18:26:51 +09:00
..
Beatmaps	Add import rollback test	2018-05-29 16:23:38 +09:00
Chat	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Resources	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Visual	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change	2018-06-06 18:26:51 +09:00
osu.Game.Tests.csproj	Update project build configurations to target netcoreapp2.1	2018-06-02 22:20:17 +09:00