Merge branch 'master' of https://github.com/music-assistant/server
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Sat, 31 Oct 2020 11:09:49 +0000 (12:09 +0100)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Sat, 31 Oct 2020 11:09:49 +0000 (12:09 +0100)

Trivial merge