Dean Herbert bf9954aede Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip ... # Conflicts: # osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs # osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs # osu.Game/Screens/Multi/IRoomManager.cs # osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs # osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs # osu.Game/Screens/Multi/RoomManager.cs		2018-12-26 21:32:12 +09:00
..
Components	Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip	2018-12-26 21:32:12 +09:00
MatchSubScreen.cs	Renaming	2018-12-26 20:05:57 +09:00