From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Tue, 14 Apr 2020 21:23:24 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/marcelveldt/musicassistant
X-Git-Url: https://git.kitaultman.com/?a=commitdiff_plain;h=392988702c0cc1bbd541b491ada5897efea92ab4;p=music-assistant-server.git

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

392988702c0cc1bbd541b491ada5897efea92ab4