Merge branch 'master' into apa-notification-on-live

This commit is contained in:
pajlada
2018-09-16 17:43:53 +02:00
committed by GitHub
53 changed files with 628 additions and 227 deletions
+2 -1
View File
@@ -28,7 +28,7 @@ class Settings;
class Fonts;
class Resources2;
class Toasts;
class ChatterinoBadges;
class Application
{
@@ -65,6 +65,7 @@ public:
TaggedUsersController *const taggedUsers{};
ModerationActions *const moderationActions{};
TwitchServer *const twitch2{};
ChatterinoBadges *const chatterinoBadges{};
/*[[deprecated]]*/ Logging *const logging{};