Merge branch 'master' of https://github.com/music-assistant/server
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Mon, 28 Dec 2020 14:56:03 +0000 (15:56 +0100)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Mon, 28 Dec 2020 14:56:03 +0000 (15:56 +0100)
commitb97df7f71ffd9dac5769b44dee0164df5810d1cf
treec018ee58c8d8b5010f289eb210f5dc50de492715
parente4db69409525bd70a1547ccef662dc43f8160b5a
parent0c42214e1a3d9b0c1d1b70b468e95be84ae6da87
Merge branch 'master' of https://github.com/music-assistant/server