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

Browse Source

Conflicts:
	libresonic-main/pom.xml

...

This commit is contained in:

Rémi Cocula

2016-11-24 22:13:05 +01:00

parent 58dae1ae97 a215cb960a

commit 685e997258

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available