Ehsan Kia 5c70075ca0 Merge branch 'master' of github.com:Jiiks/BetterDiscordApp into bttv-update-nov5 ... # Conflicts: # data/emotedata_ffz.json		2016-11-06 00:48:42 -07:00
..
emotedata_bttv.json	Update BTTV emote db	2016-11-05 16:27:00 -07:00
emotedata_ffz.json	Remove ImTriggered from FFZ	2016-11-05 16:24:35 -07:00
emotedata_twitch.json	Organize repo for 0.2.5	2015-12-18 17:40:26 +02:00
emotedata_twitch_global.json	Twitch emotedata	2016-03-30 04:08:18 +03:00
emotedata_twitch_subscriber.json	Twitch emotedata	2016-03-30 04:08:18 +03:00
emotefilter.json	added Okie	2016-11-02 07:38:03 +02:00
serverlist.json	Remove and archive serverlist	2016-04-07 17:01:24 +03:00
serverlist_archive.json	Remove and archive serverlist	2016-04-07 17:01:24 +03:00
updater.json	0.2.7 updater	2016-03-30 04:09:10 +03:00