Zak Peirce b0e91b5569 Merge branch 'develop' of github.com:libresonic/libresonic into nolicense ...

Conflicts:
	libresonic-main/src/main/java/org/libresonic/player/command/NetworkSettingsCommand.java
	libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java
	libresonic-main/src/main/webapp/WEB-INF/jsp/premiumSettings.jsp

2016-12-20 13:19:34 -08:00

..

src

Merge branch 'develop' of github.com:libresonic/libresonic into nolicense

2016-12-20 13:19:34 -08: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

Fix build dependency

2016-12-18 20:00:33 -07:00