Merge remote-tracking branch 'origin/develop' into develop

2019-06-18 02:11:58 -04:00
parent d54d839ab5 4eee13a359
commit 8c91e52a8a
11 changed files with 78 additions and 16 deletions
@@ -12,6 +12,7 @@ bet=
 guildrolelist=
 stats=
 catch=
+color, colour=
 guildroleadd=
 results=
 wolfram=