Skip to content
Snippets Groups Projects
Commit 774fd7c7 authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'origin-master' into origin-dev#72845_bdp_yonne_evolution_connecteur_cvs

Conflicts:
	tests/application/modules/admin/controllers/ModulesControllerTest.php
	tests/application/modules/opac/controllers/RechercheControllerTest.php
parents 6418e910 e68c0e9f
1 merge request!2661Dev#72845 bdp yonne evolution connecteur cvs
Pipeline #4193 passed with stage
in 53 minutes and 32 seconds