Merge branch 'master' of https://github.com/music-assistant/server
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Tue, 3 Aug 2021 18:44:22 +0000 (20:44 +0200)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Tue, 3 Aug 2021 18:44:22 +0000 (20:44 +0200)
commit9ae36b9b2545e7c1cf1c2915f200740af12fac1e
treed0a0533735b98061a61ae65ba62dc56574121e67
parent9b015fb30995748804072169ecc0c04f7379a1f8
parentfc940d31cb3f9bd3d4a11e411becb0bdafb169af
Merge branch 'master' of https://github.com/music-assistant/server