Andrew DeMaria 7c19e9f4ab Merge branch 'stable' into develop ...

Signed-off-by: Andrew DeMaria <lostonamountain@gmail.com>

Conflicts:
	libresonic-main/pom.xml
	libresonic-rest-api/pom.xml
	libresonic-sonos-api/pom.xml
	pom.xml

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

..

src

Merge branch 'stable' into develop

2017-05-04 17:38:42 -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