Merge branch 'master' of https://github.com/marcelveldt/musicassistant
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Tue, 14 Apr 2020 21:23:24 +0000 (23:23 +0200)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Tue, 14 Apr 2020 21:23:24 +0000 (23:23 +0200)

Trivial merge