Merge branch 'release-3.0'
Conflicts: composer.json
Showing
- build.xml 1 addition, 1 deletionbuild.xml
- composer.json 0 additions, 6 deletionscomposer.json
- config/vufind/config.ini 1 addition, 1 deletionconfig/vufind/config.ini
- packages/DEBIAN/changelog 6 additions, 0 deletionspackages/DEBIAN/changelog
- packages/DEBIAN/control 1 addition, 1 deletionpackages/DEBIAN/control
Please register or sign in to comment