Merge branch 'master' of https://github.com/music-assistant/server
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Mon, 28 Dec 2020 14:56:03 +0000 (15:56 +0100)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Mon, 28 Dec 2020 14:56:03 +0000 (15:56 +0100)

Trivial merge