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

2016-04-09 21:32:49 +03:00 · 2016-04-09 21:32:49 +03:00 · 8e4d0b68f9
parent 151428d0e2 fd556b0ecb
commit 8e4d0b68f9
2 changed files with 4 additions and 2 deletions
--- a/data/emotedata_ffz.json
+++ b/data/emotedata_ffz.json
--- a/data/emotefilter.json
+++ b/data/emotefilter.json
@ -82,6 +82,8 @@
  	"Gaben",
  	"Alexis",
  	"Gerald",
-  	"Senpai"
+  	"Senpai",
+	"Derp",
+	"NOICE"
  ]
 }