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

@ -6,7 +6,6 @@ using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Game.Graphics;
using osu.Game.Graphics.UserInterface;
using System;
@ -23,7 +22,6 @@ namespace osu.Game.Overlays.News
public Action ShowFrontPage;
public NewsHeader()
: base(OverlayColourScheme.Purple)
{
TabControl.AddItem(front_page_string);