Conflict merge

https://github.com/Jiiks/BetterDiscordApp/pull/432
2017-02-10 15:46:12 +02:00 · 2017-02-10 15:46:12 +02:00 · 79d9c6f00c
parent 391b6a2085
commit 79d9c6f00c
1 changed files with 12 additions and 1 deletions
--- a/data/emotefilter.json
+++ b/data/emotefilter.json
@ -191,6 +191,17 @@
    "Rucksack",
    "Rein",
    "Dirk",
-    "Moin"
+    "Moin",
+    "Heya!",
+    "Crossover",
+    "Kitsune",
+    "Gengar",
+    "Nebby",
+    "Uhhh",
+    "Runescape",
+    "Shitpost",
+    "Dunno",
+    "Challenge",
+    "Shulk"
  ]
 }