Merge branch 'master' of https://github.com/music-assistant/server
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Sun, 13 Sep 2020 00:00:25 +0000 (02:00 +0200)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Sun, 13 Sep 2020 00:00:25 +0000 (02:00 +0200)

Trivial merge