smoogipoo ffbe6f2e37 Merge remote-tracking branch 'origin/master' into fix-rank-status ... # Conflicts: # osu.Game/Beatmaps/RankStatus.cs # osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs # osu.Game/Overlays/Direct/FilterControl.cs # osu.Game/Overlays/DirectOverlay.cs		2018-04-18 14:16:58 +09:00
..
Requests	Merge remote-tracking branch 'origin/master' into fix-rank-status	2018-04-18 14:16:58 +09:00
APIAccess.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
APIDownloadRequest.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
APIRequest.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
DummyAPIAccess.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
IAPIProvider.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
IOnlineComponent.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
OAuth.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00
OAuthToken.cs	Normalize all the line endings	2018-04-13 18:26:38 +09:00