Merge branch 'master' of https://github.com/Jiiks/BetterDiscordApp

2016-06-24 02:12:47 +03:00 · 2016-06-24 02:12:47 +03:00 · 4fa8d75653
parent ef3d2ad9b1 995868b5b9
commit 4fa8d75653
3 changed files with 12 additions and 3 deletions
--- a/data/emotedata_bttv.json
+++ b/data/emotedata_bttv.json
--- a/data/emotedata_ffz.json
+++ b/data/emotedata_ffz.json
--- a/data/emotefilter.json
+++ b/data/emotefilter.json
@ -76,6 +76,15 @@
    "Pleure",
    "Lunch",
    "Mackey",
-    "OVERWATCH"
+    "OVERWATCH",
+    "YES!",
+    "Bepis",
+    "HAHAHA",
+    "Chocobo",
+    "Jace",
+    "Ayaya",
+    "Dayum",
+    "Everyone!",
+    "Stalin"
  ]
 }