Merge remote-tracking branch 'refs/remotes/origin/master' into... (0ac240e7) · 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 0ac240e7 authored 6 years ago by

Ghislain Loas

Merge remote-tracking branch 'refs/remotes/origin/master' into...

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#64573_templates_pour_l_interface_publique_libraire_bootstrap

Conflicts:
tests/application/modules/opac/controllers/RechercheControllerHistoriqueRechercheTest.php

parents 70d09c84 e1e36e70

Branches

Tags

3 merge requests!3297WIP: Master,!3037Master,!2988Dev#64573 templates pour l interface publique libraire bootstrap

Pipeline #6450 passed with stage

in 34 minutes and 55 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 202 additions and 159 deletions

Please register or to comment