Andrew DeMaria 105cd729c9 Merge remote-tracking branch 'origin/stable' into develop ...

Conflicts:
	documentation/developer/jmeter-main-test-plan.png
	documentation/developer/metrics-visualvm-screenshot.png

2017-05-18 22:38:46 -06:00

..

src

Merge remote-tracking branch 'origin/stable' into develop

2017-05-18 22:38:46 -06: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

Merge branch 'stable' into develop

2017-05-04 17:38:42 -06:00