Conflicts: CHANGELOG.md INSTALL.md libresonic-assembly/pom.xml libresonic-booter/pom.xml libresonic-booter/src/main/resources/images/libresonic-512.png libresonic-installer-debian/pom.xml libresonic-installer-mac/pom.xml libresonic-installer-rpm/pom.xml libresonic-installer-windows/pom.xml libresonic-main/pom.xml libresonic-main/src/main/java/org/libresonic/player/dao/schema/hsql/Schema62.java libresonic-main/src/main/resources/org/libresonic/player/service/logo-512.png libresonic-main/src/main/webapp/icons/buuftheme/logo.png libresonic-main/src/main/webapp/icons/coolandclean/logo.png libresonic-main/src/main/webapp/icons/default_dark/logo_light.png libresonic-main/src/main/webapp/icons/default_light/logo.png libresonic-main/src/main/webapp/icons/denim/logo_light.png libresonic-main/src/main/webapp/icons/groove/logo.png libresonic-main/src/main/webapp/icons/hicon/logo.png libresonic-main/src/main/webapp/icons/hiconi/logo_light.png libresonic-main/src/main/webapp/icons/hitech/logo_light.png libresonic-main/src/main/webapp/icons/midnightfun/logo.png libresonic-main/src/main/webapp/icons/monochrome/logo.png libresonic-main/src/main/webapp/icons/monochrome/logo_light.png libresonic-main/src/main/webapp/icons/pinkpanther/logo_light.png libresonic-main/src/main/webapp/icons/simplify/logo_light.png libresonic-main/src/main/webapp/icons/slick/logo_light.png libresonic-main/src/main/webapp/icons/sonic/logo.png libresonic-main/src/main/webapp/icons/sonic_blue/logo_light.png libresonic-main/src/main/webapp/icons/sonic_white/logo.png libresonic-main/src/main/webapp/icons/subStandard/logo_light.png libresonic-rest-api/pom.xml libresonic-sonos-api/pom.xml pom.xmlmaster
commit
a12bdd6e0a
After Width: | Height: | Size: 2.6 KiB |
After Width: | Height: | Size: 2.6 KiB |
After Width: | Height: | Size: 3.2 KiB |
After Width: | Height: | Size: 3.3 KiB |
After Width: | Height: | Size: 183 KiB |
Loading…
Reference in new issue