Conflict merge

https://github.com/Jiiks/BetterDiscordApp/pull/420
This commit is contained in:
Jiiks 2017-02-10 15:48:56 +02:00
parent 79d9c6f00c
commit 031c64271a
1 changed files with 9 additions and 1 deletions

View File

@ -202,6 +202,14 @@
"Shitpost", "Shitpost",
"Dunno", "Dunno",
"Challenge", "Challenge",
"Shulk" "Shulk",
"Peach",
"Leffen",
"STEAK",
"Lars",
"Kirby",
"Samus",
"Toad",
"Poopy"
] ]
} }