Merge the master branch into Greg's branch #273

Merged
greg6775 merged 47 commits from master into greg-dev 2019-12-28 18:52:36 +01:00
Showing only changes of commit 9122349d92 - Show all commits

View file

@ -16,6 +16,7 @@ region = <region>
guildid = <Guild-ID>
content = <Message-content>
song = <Song>
user/id= [@User]/[ID]
error = Error
none = None