Merge remote-tracking branch 'origin/biconou_develop_PR_MediaScannerTestCase' into biconou_develop_PR_MediaScannerTestCase

Conflicts:
	libresonic-main/pom.xml
master
Rémi Cocula 8 years ago
commit 685e997258

Diff Content Not Available