miterosan ba5861b527 Merge remote-tracking branch 'origin/master' into Private_Messages ... # Conflicts: # osu.Game/Online/API/Requests/GetMessagesRequest.cs # osu.Game/Overlays/Chat/ChatTabControl.cs		2018-05-06 19:45:33 +02:00
..
API	Merge remote-tracking branch 'origin/master' into Private_Messages	2018-05-06 19:45:33 +02:00
Chat	Only use one tabControl (channeltabcontrol). Fix that the Channel messages did not refresh.	2018-04-18 20:46:42 +02:00
Multiplayer	Normalize all the line endings	2018-04-13 18:26:38 +09:00