Merge remote-tracking branch 'origin/master' into error_codes
Conflicts: themes/bootstrap3/js/check_save_statuses.js
Showing
- module/VuFind/src/VuFind/Controller/AjaxController.php 5 additions, 8 deletionsmodule/VuFind/src/VuFind/Controller/AjaxController.php
- themes/bootstrap3/js/check_save_statuses.js 17 additions, 18 deletionsthemes/bootstrap3/js/check_save_statuses.js
- themes/bootstrap3/templates/RecordDriver/SolrDefault/result-list.phtml 1 addition, 1 deletion...rap3/templates/RecordDriver/SolrDefault/result-list.phtml
Please register or sign in to comment