Merge branch 'master' of https://github.com/music-assistant/server
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Mon, 14 Sep 2020 06:37:21 +0000 (08:37 +0200)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Mon, 14 Sep 2020 06:37:21 +0000 (08:37 +0200)

Trivial merge