Merge pull request #6 from Jiiks/master

Update to latest changes
2016-11-08 19:53:25 +00:00 · 2016-11-08 19:53:25 +00:00 · faa7b30df5
parent 9a638e7eb3 fd3dab39de
commit faa7b30df5
1 changed files with 3 additions and 1 deletions
--- a/data/emotefilter.json
+++ b/data/emotefilter.json
@ -173,6 +173,8 @@
    "Ohok",
    "SRS!",
    "Isis",
-    "Okie"
+    "Okie",
+    "Nein",
+    "Pokeball"
  ]
 }