Merge branch 'master' of https://github.com/music-assistant/server
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Wed, 23 Dec 2020 19:24:45 +0000 (20:24 +0100)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Wed, 23 Dec 2020 19:24:45 +0000 (20:24 +0100)

Trivial merge