Merge branch 'origin-master' into origin-dev#72845_bdp_yonne_evolution_connecteur_cvs (774fd7c7) · Commits · afi / opacce

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 latest pipeline status.

Commit 774fd7c7 authored 6 years ago by

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

Branches

Admin message

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