Merge branch... (cfff329e) · Commits · afi / opacce · GitLab

Snippets Groups Projects

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Commit cfff329e authored 4 years ago by

Ghislain Loas

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/TemplatesWidgetTest.php

parents a56f0079 7183657d

Branches

Tags

1 merge request!3745hotline MT #122292 add liste_format setting to search result

Pipeline #11733 failed with stage

in 1 hour and 1 second

Hide whitespace changes

Inline Side-by-side

Showing with 85 additions and 3 deletions

Please register or to comment