Merge remote-tracking branch 'upstream/master' into api-channels-messages

Conflicts:
	osu.Game/Online/Chat/Message.cs
This commit is contained in:
Dean Herbert
2016-09-29 23:54:33 +09:00
14 changed files with 91 additions and 24 deletions

View File

@ -2,6 +2,7 @@
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Diagnostics;
using System.Security;
using osu.Framework.Extensions;
@ -35,6 +36,8 @@ namespace osu.Game.Online.API
internal string Get(Representation request = Representation.Raw)
{
Debug.Assert(representation == request);
switch (request)
{
default: