Merge branch 'master' of https://github.com/marcelveldt/musicassistant
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Sat, 5 Sep 2020 20:33:26 +0000 (22:33 +0200)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Sat, 5 Sep 2020 20:33:26 +0000 (22:33 +0200)
commit1cde3a14dd1a982715be912364ddad6a7c4b59fb
tree7f67600f3a2fb244502b6988c44445f93969b2d0
parent62f6af3fb3a4d0dcfc6c8ce80a9c60cbfdad4295
parentd5275cbef7c2e6540bf217b6d35d8bf192783f42
Merge branch 'master' of https://github.com/marcelveldt/musicassistant