noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/widgets/dialogs/EmotePopup.cpp
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