version 7.5.25
Merge remote-tracking branch 'refs/remotes/origin/stable' into origin-hotline-master Conflicts: VERSIONS library/Class/Catalogue.php library/startup.php tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php
Showing
- VERSIONS 9 additions, 0 deletionsVERSIONS
- VERSIONS_HOTLINE/41431 0 additions, 1 deletionVERSIONS_HOTLINE/41431
- library/Class/Catalogue.php 15 additions, 11 deletionslibrary/Class/Catalogue.php
- library/Class/WebService/BibNumerique/CVS/AlbumParser.php 5 additions, 5 deletionslibrary/Class/WebService/BibNumerique/CVS/AlbumParser.php
- library/Trait/JsonDomain.php 12 additions, 4 deletionslibrary/Trait/JsonDomain.php
- library/startup.php 1 addition, 1 deletionlibrary/startup.php
- tests/application/modules/opac/controllers/AbonneControllerSettingsTest.php 29 additions, 3 deletions...modules/opac/controllers/AbonneControllerSettingsTest.php
- tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php 58 additions, 15 deletions...ion/modules/opac/controllers/NoticeAjaxControllerTest.php
- tests/fixtures/cvs_search_delpy.xml 1144 additions, 0 deletionstests/fixtures/cvs_search_delpy.xml
- tests/library/ZendAfi/View/Helper/Accueil/SitoTest.php 3 additions, 2 deletionstests/library/ZendAfi/View/Helper/Accueil/SitoTest.php
Please register or sign in to comment