Dean Herbert b4c9dca54b Merge remote-tracking branch 'upstream/master' into api-channels-messages ...

Conflicts:
	osu.Game/Online/Chat/Message.cs

2016-09-29 23:54:33 +09:00

..

Requests

Add back basic API support for channel/message retrieval.

2016-09-27 18:33:52 +09:00

APIAccess.cs

Fix API scheduling.

2016-09-27 19:22:08 +09:00

APIRequest.cs

Fix API scheduling.

2016-09-27 19:22:08 +09:00

OAuth.cs

Update framework again.

2016-09-21 17:37:33 +09:00

OAuthToken.cs

Update font logic to override framework default.

2016-09-01 22:47:48 +09:00

SecurePassword.cs

Fix a few warnings.

2016-09-29 23:46:27 +09:00