Skip to content
Snippets Groups Projects
Commit ee01becb authored by Ghislain Loas's avatar Ghislain Loas Committed by Laurent
Browse files

Merge branch... 

Merge branch 'hotline#122292_gpsea_p3_magasin_de_themes_choisir_affichage_par_defaut_resultat_de_recherche' of git.afi-sa.net:afi/opacce into hotline#122292_gpsea_p3_magasin_de_themes_choisir_affichage_par_defaut_resultat_de_recherche

# Conflicts:
#	tests/scenarios/Templates/TemplatesSearchTest.php
parents e97b0563 cfff329e
Pipeline #11740 canceled with stage
in 31 minutes and 8 seconds
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment