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

2018-08-12 23:30:18 +02:00
parent f6414c9d7e 7ff4f12257
commit f1fbd7ee5c
1 changed files with 1 additions and 1 deletions
@@ -127,7 +127,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
    // global
    addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(),
              "BetterTTV");
-    addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(),
+    addEmotes(*globalChannel, *twitchChannel->globalFfz().emotes(),
              "FrankerFaceZ");

    // channel