Merge branch 'master' into apa-notification-on-live
This commit is contained in:
+2
-1
@@ -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{};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user