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
This commit is contained in:
Eugene E. Kashpureff Jr
2016-11-27 18:53:36 +00:00
15 changed files with 18 additions and 16 deletions
+1 -1
View File
@@ -9,7 +9,7 @@
<parent>
<groupId>org.libresonic.player</groupId>
<artifactId>libresonic</artifactId>
<version>6.1.rc1</version>
<version>6.1</version>
</parent>
<dependencies>