Merge branch 'master' into origin-sandbox_improve_search_page (e02a0835) · 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.

There was a problem fetching the pipeline stages.

Commit e02a0835 authored 8 years ago by

Ghislain Loas

Merge branch 'master' into origin-sandbox_improve_search_page

Conflicts:
	application/modules/opac/controllers/RechercheController.php
	application/modules/opac/views/scripts/recherche/resultatRecherche.phtml

parents 0bddd427 aa1795bc

Branches

Tags

5 merge requests!2334Master,!2102#57574 : correction orthographe des jours de la semaine,!2068Dev#57305 story status sandbox improve search page,!2064Dev#57305 story status sandbox improve search page,!2063Sandbox improve search page

Pipeline #642 failed with stage

in 11 minutes and 1 second

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 334 additions and 1588 deletions

Please register or to comment