Rémi Cocula 0e7c41d299 Merge branch 'develop' into biconou_develop_PR_metrics ...

Conflicts:
	libresonic-main/src/main/resources/application.properties

2017-01-13 22:18:37 +01:00

..

src

Merge branch 'develop' into biconou_develop_PR_metrics

2017-01-13 22:18:37 +01:00

dreamplug.txt

Subsonic-->Libresonic regex

2016-05-14 22:26:36 +00:00

Getting Started.html

Subsonic-->Libresonic regex

2016-05-14 22:26:36 +00:00

LICENSE.TXT

Subsonic-->Libresonic regex

2016-05-14 22:26:36 +00:00

pom.xml

Add metrics filter

2017-01-12 21:53:52 +01:00