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

Conflict merge 

https://github.com/Jiiks/BetterDiscordApp/pull/424
This commit is contained in:
Jiiks 2017-02-10 15:52:14 +02:00
parent 44073ed15d
commit f7fa19dcf8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/emotefilter.json
View File

@ -211,6 +211,8 @@
"Samus", "Samus",
"Toad", "Toad",
"Poopy", "Poopy",
"Alexis" "Alexis",
"Dante",
"Lotus"
] ]
} }