Merge branch 'master' of git://github.com/ppy/osu into profile-header-update

This commit is contained in:
jorolf
2019-01-27 23:32:48 +01:00
1329 changed files with 3270 additions and 3051 deletions

View File

@ -1,5 +1,5 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using System;
using Newtonsoft.Json;
@ -96,6 +96,5 @@ namespace osu.Game.Users
[JsonProperty(@"country")]
public int? Country;
}
}
}