Merge branch 'master' of https://github.com/music-assistant/server
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Tue, 29 Sep 2020 08:47:51 +0000 (10:47 +0200)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Tue, 29 Sep 2020 08:47:51 +0000 (10:47 +0200)

Trivial merge