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

Trivial merge