There was an error fetching the commit references. Please try again later.
Merge branch 'master' of https://github.com/vufind-org/vufind
Conflicts: themes/bootstrap/js/lightbox.js
Showing
- config/vufind/sitemap.ini 9 additions, 0 deletionsconfig/vufind/sitemap.ini
- languages/en-gb.ini 1 addition, 0 deletionslanguages/en-gb.ini
- languages/en.ini 1 addition, 0 deletionslanguages/en.ini
- module/VuFind/src/VuFind/Recommend/SwitchQuery.php 24 additions, 0 deletionsmodule/VuFind/src/VuFind/Recommend/SwitchQuery.php
- module/VuFind/src/VuFind/Sitemap.php 70 additions, 30 deletionsmodule/VuFind/src/VuFind/Sitemap.php
- module/VuFind/src/VuFind/View/Helper/Root/JsTranslations.php 1 addition, 1 deletionmodule/VuFind/src/VuFind/View/Helper/Root/JsTranslations.php
- module/VuFindConsole/src/VuFindConsole/Controller/UtilController.php 1 addition, 3 deletions...ndConsole/src/VuFindConsole/Controller/UtilController.php
- module/VuFindSearch/src/VuFindSearch/Backend/Solr/Connector.php 10 additions, 0 deletions.../VuFindSearch/src/VuFindSearch/Backend/Solr/Connector.php
- themes/blueprint/js/common.js 1 addition, 1 deletionthemes/blueprint/js/common.js
- themes/bootstrap/js/lightbox.js 3 additions, 3 deletionsthemes/bootstrap/js/lightbox.js
Please register or sign in to comment