MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into _tmp

Browse Source 
Conflicts:
	libresonic-main/pom.xml
	libresonic-main/src/main/java/org/libresonic/player/controller/ChangeCoverArtController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/DLNASettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/InternetRadioSettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/PlayQueueController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/RightController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/ShareManagementController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/ShareSettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/SonosSettingsController.java
	libresonic-main/src/main/java/org/libresonic/player/controller/TranscodingSettingsController.java
	libresonic-main/src/main/webapp/WEB-INF/libresonic-servlet.xml
	pom.xml
This commit is contained in:
Rémi Cocula
2016-12-22 23:26:10 +01:00
parent b2dd04e864 8d28f2ab87
commit e5dc517fa1
83 changed files with 726 additions and 1307 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libresonic-installer-windows/pom.xml
-1
View File
@@ -59,7 +59,6 @@
<copy file="${basedir}/src/main/exe4j/libresonic-agent-elevated.exe.vmoptions" todir="${project.build.directory}"/>
<copy file="${basedir}/src/main/exe4j/libresonic-service.exe.vmoptions" todir="${project.build.directory}"/>
<exec executable="${exe4j.home}/bin/exe4jc">
<arg value="--license=L-SINDRE_MEHUS#14926715500010001-1ty7dbe11l10ll#140"/>
</exec>
<exec executable="${exe4j.home}/bin/exe4jc">
<arg value="${basedir}/src/main/exe4j/libresonic-agent.exe4j"/>