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
@@ -57,7 +57,6 @@ public:

    const std::string &getUUID() const;
    ChannelPtr getChannel() const;
-    ChannelPtr &getChannelRef();
    void setFlexSizeX(double x);
    double getFlexSizeX();
    void setFlexSizeY(double y);