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)
commitde0e25777f2bfbf857ecb77f3e426d5e17569f36
treeae7932232a7b1e0853d4a7a5f36624b87dc715b1
parent3d176d5d206b362aaf87b2ed9bf11ceabcc102c2
parent93b7b444091a2610bf3b71747fbe0398455a68ab
Merge branch 'master' of https://github.com/music-assistant/server