Merge branch 'master' of https://github.com/music-assistant/server
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Wed, 23 Dec 2020 19:24:45 +0000 (20:24 +0100)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Wed, 23 Dec 2020 19:24:45 +0000 (20:24 +0100)
commit5765a2b7162eac9cbedc7a41623a318b507bbf57
treecdd93bdba95129aee72feb3d63ba81c305bf4087
parent4b12eb0455ef5a8415acf7bcb5db352090d13d84
parent6d981cfdc3a9cba1d8d2f92c30adde16ec07f706
Merge branch 'master' of https://github.com/music-assistant/server