Merge branch 'master' of https://github.com/fourtf/chatterino2

2018-02-05 21:20:38 +01:00
parent b351c40d29 556dbe0456
commit a44758ad23
23 changed files with 255 additions and 104 deletions
@@ -1,5 +1,6 @@
 #pragma once

+#include <QColor>
 #include <QString>

 namespace chatterino {
@@ -27,6 +28,8 @@ public:

    bool isAnon() const;

+    QColor color;
+
 private:
    QString oauthClient;
    QString oauthToken;