 Zak Peirce
|
7e9c2582f5
|
fixed derps with merges
|
2016-12-20 13:29:32 -08:00 |
|
|
Zak Peirce
|
3d23b540ba
|
fixed some derps with merge conflicts
|
2016-12-20 13:27:25 -08:00 |
|
|
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 |
|
|
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 |
|
|
Zak Peirce
|
baa681619c
|
Forgot to remove the premiumSettings.jsp
|
2016-12-20 12:33:55 -08:00 |
|
|
Zak Peirce
|
72851f0721
|
Back ported last.fm coverart service from Subsonic 6.0_beta1
None of this code is mine, I just integrated it.
|
2016-12-20 11:41:02 -08:00 |
|
|
Zak Peirce
|
2b236e8d47
|
Missed a couple lines in the playqueuecast.jsp
|
2016-12-16 12:15:40 -08:00 |
|
|
Zak Peirce
|
e06d9dbc22
|
Removed the rest of the license, now builds
|
2016-12-16 11:50:44 -08:00 |
|
|
Zak Peirce
|
66ae21856c
|
Removed all traces of premium license
|
2016-12-16 10:46:40 -08:00 |
|