Merge master with conflicts resolved

This commit is contained in:
Andrei Zavatski
2020-01-26 16:35:07 +03:00
20 changed files with 160 additions and 136 deletions

View File

@ -24,7 +24,6 @@ namespace osu.Game.Overlays.Profile
private DetailHeaderContainer detailHeaderContainer;
public ProfileHeader()
: base(OverlayColourScheme.Green)
{
BackgroundHeight = 150;