Merge branch 'master' of https://github.com/music-assistant/server
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Mon, 2 Nov 2020 16:56:55 +0000 (17:56 +0100)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Mon, 2 Nov 2020 16:56:55 +0000 (17:56 +0100)
commit9207a84f57cfb2d31fb0bd069088e783a21418f3
tree5a71d950a9cf4b0e89d31c34156ac02344a869ee
parent8020f2d9be6b9edb5866206dbedb9f760c729a7a
parentce6181c86ab208b11be326b26c862a325cbe5141
Merge branch 'master' of https://github.com/music-assistant/server