From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Sat, 5 Sep 2020 20:33:26 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/marcelveldt/musicassistant
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=1cde3a14dd1a982715be912364ddad6a7c4b59fb;p=music-assistant-server.git

Merge branch 'master' of https://github.com/marcelveldt/musicassistant
---

1cde3a14dd1a982715be912364ddad6a7c4b59fb