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)
commit392988702c0cc1bbd541b491ada5897efea92ab4
tree3c85328ac6f258f58076b8cffa787e58ff271861
parent1ce27e8b8d531d9d043feac4bd817c6808e003aa
parent4d2e39603828b7bbea8eba2bbb5d832af755e1f4
Merge branch 'master' of https://github.com/marcelveldt/musicassistant