Auto stash before merge of "develop" and "master"

This commit is contained in:
Alex Stewart
2019-07-27 23:34:37 -07:00
parent 7494696007
commit 3af46e94da
35 changed files with 287 additions and 97 deletions
+2
View File
@@ -37,6 +37,7 @@
"Localized Commands","kittyrole",""
"Localized Commands","leaderboard",""
"Localized Commands","map",""
"Localized Commands","mod",""
"Localized Commands","perish, thenperish",""
"Localized Commands","ping",""
"Localized Commands","poll",""
@@ -294,6 +295,7 @@
"Command Enabler","kittyrole","1"
"Command Enabler","leaderboard","1"
"Command Enabler","map","1"
"Command Enabler","mod","1"
"Command Enabler","perish, thenperish","1"
"Command Enabler","ping","1"
"Command Enabler","poll","1"
1 Type Key Value
37 Localized Commands kittyrole
38 Localized Commands leaderboard
39 Localized Commands map
40 Localized Commands mod
41 Localized Commands perish, thenperish
42 Localized Commands ping
43 Localized Commands poll
295 Command Enabler kittyrole 1
296 Command Enabler leaderboard 1
297 Command Enabler map 1
298 Command Enabler mod 1
299 Command Enabler perish, thenperish 1
300 Command Enabler ping 1
301 Command Enabler poll 1