MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
473902cdcaad9977904002febead03c3bcfffa48
airsonic-custom/libresonic-installer-windows
T
History
Rémi Cocula e5dc517fa1 Merge branch 'develop' into _tmp 
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
2016-12-22 23:26:10 +01:00
..
src/main
Subsonic-->Libresonic regex
2016-05-14 22:26:36 +00:00
pom.xml
Merge branch 'develop' into _tmp
2016-12-22 23:26:10 +01:00