chatterino2
Code Issues

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

Browse Source
This commit is contained in:
fourtf
2018-08-12 23:30:18 +02:00
parent f6414c9d7e 7ff4f12257
commit f1fbd7ee5c
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/dialogs/EmotePopup.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
// global // global
addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(), addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(),
"BetterTTV"); "BetterTTV");
addEmotes(*globalChannel, *twitchChannel->globalBttv().emotes(), addEmotes(*globalChannel, *twitchChannel->globalFfz().emotes(),
"FrankerFaceZ"); "FrankerFaceZ");
// channel // channel