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)
commit9943814c043c30baa3d30b0b804fdbfc1277d7b7
tree74b20658de1bc653bb8dffccb7b4c55b635e44ce
parent87cf3ee914a3abbe814d8045fbabc1502fdce120
parent1198e769c5f2539c0aeb63a5634ea2542321fa89
Merge branch 'master' of https://github.com/music-assistant/server