Eugene E. Kashpureff Jr 5c5bce6f8d Merge 6.1.beta2 into stable ...

Conflicts:
	CHANGELOG.md
	INSTALL.md
	documentation/FreeBSD-FreeNAS-Install.md
	documentation/INSTALL.md
	libresonic-assembly/pom.xml
	libresonic-booter/pom.xml
	libresonic-installer-debian/pom.xml
	libresonic-installer-mac/pom.xml
	libresonic-installer-rpm/pom.xml
	libresonic-installer-windows/pom.xml
	libresonic-main/pom.xml
	libresonic-rest-api/pom.xml
	libresonic-sonos-api/pom.xml
	pom.xml

2016-11-27 18:53:36 +00:00

..

src/main/resources

Emulate Subsonic API for third-party app benefit

2016-05-16 16:11:45 +00:00

pom.xml

Merge 6.1.beta2 into stable

2016-11-27 18:53:36 +00:00