Merge branch 'master' of https://github.com/music-assistant/server
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Mon, 2 Nov 2020 16:56:55 +0000 (17:56 +0100)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Mon, 2 Nov 2020 16:56:55 +0000 (17:56 +0100)

Trivial merge