h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 16:52:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-importing-some-beatmaps

Browse Source
This commit is contained in:
Dean Herbert 2017-12-08 21:18:01 +09:00 committed by GitHub
commit 40652d2e74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Profile/ProfileHeader.cs
View File

@ -382,7 +382,7 @@ namespace osu.Game.Overlays.Profile
} }
tryAddInfoRightLine(FontAwesome.fa_map_marker, user.Location); tryAddInfoRightLine(FontAwesome.fa_map_marker, user.Location);
tryAddInfoRightLine(FontAwesome.fa_heart_o, user.Intrerests); tryAddInfoRightLine(FontAwesome.fa_heart_o, user.Interests);
tryAddInfoRightLine(FontAwesome.fa_suitcase, user.Occupation); tryAddInfoRightLine(FontAwesome.fa_suitcase, user.Occupation);
infoTextRight.NewParagraph(); infoTextRight.NewParagraph();
if (!string.IsNullOrEmpty(user.Twitter)) if (!string.IsNullOrEmpty(user.Twitter))

2
osu.Game/Users/User.cs
View File

@ -75,7 +75,7 @@ namespace osu.Game.Users
public bool Active; public bool Active;
[JsonProperty(@"interests")] [JsonProperty(@"interests")]
public string Intrerests; public string Interests;
[JsonProperty(@"occupation")] [JsonProperty(@"occupation")]
public string Occupation; public string Occupation;