lightcordwarez
/
BetterDiscordApp-v1
mirror of https://github.com/jiiks/betterdiscordapp.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Conflict merge 

https://github.com/Jiiks/BetterDiscordApp/pull/433
This commit is contained in:
Jiiks 2017-02-10 15:50:16 +02:00
parent 031c64271a
commit 44073ed15d
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/emotefilter.json
View File

@ -210,6 +210,7 @@
"Kirby", "Kirby",
"Samus", "Samus",
"Toad", "Toad",
"Poopy" "Poopy",
"Alexis"
] ]
} }