fix merge conflict
Showing
- application/modules/opac/controllers/AbonneController.php 1 addition, 1 deletionapplication/modules/opac/controllers/AbonneController.php
- library/Class/Catalogue.php 23 additions, 13 deletionslibrary/Class/Catalogue.php
- tests/application/modules/opac/controllers/AbonneControllerSettingsTest.php 1 addition, 1 deletion...modules/opac/controllers/AbonneControllerSettingsTest.php
Please register or sign in to comment