Dean Herbert aa96d98822 Merge branch 'master' into limit-game-access ... Conflicts: osu.Desktop.VisualTests/Tests/TestCaseChatDisplay.cs osu.Game/GameModes/Menu/ButtonSystem.cs osu.Game/Online/Chat/Display/ChatLine.cs osu.Game/OsuGame.cs osu.Game/Overlays/ToolbarButton.cs		2016-10-12 20:44:33 +09:00
..
API	Merge remote-tracking branch 'upstream/master' into api-channels-messages	2016-09-29 23:54:33 +09:00
Chat	Merge branch 'master' into limit-game-access	2016-10-12 20:44:33 +09:00
User.cs	Add back basic API support for channel/message retrieval.	2016-09-27 18:33:52 +09:00