MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
28f81a7107a5434a2a6c7ef318137c5067f2bb51
airsonic-custom/libresonic-main
T
History
Zak Peirce 28f81a7107 Merge branch 'develop' into develop-nolicense-fixcoverart 
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
2016-12-20 13:24:36 -08:00
..
src
Merge branch 'develop' into develop-nolicense-fixcoverart
2016-12-20 13:24:36 -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
Merge branch 'develop' into develop-nolicense-fixcoverart
2016-12-20 13:24:36 -08:00