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)
commit1fa1517982dd877b1315493a8302f6e0bdcfdcda
treee26af6c8c9ea917009127256f1f1ce7bee372fe2
parent9f56511efd1667803b36a4a77b00fa2586a852ca
parent2ce72e4818dcba147f8b5496724ae3aff42cf638
Merge branch 'master' of https://github.com/music-assistant/server