Conflict merge

https://github.com/Jiiks/BetterDiscordApp/pull/420
2017-02-10 15:48:56 +02:00 · 2017-02-10 15:48:56 +02:00 · 031c64271a
parent 79d9c6f00c
commit 031c64271a
1 changed files with 9 additions and 1 deletions
--- a/data/emotefilter.json
+++ b/data/emotefilter.json
@ -202,6 +202,14 @@
    "Shitpost",
    "Dunno",
    "Challenge",
-    "Shulk"
+    "Shulk",
+    "Peach",
+    "Leffen",
+    "STEAK",
+    "Lars",
+    "Kirby",
+    "Samus",
+    "Toad",
+    "Poopy"
  ]
 }