Merge branch 'origin-master' into dev#99489_magasin_de_themes_bases_sur_bootstrap (3eb4c2be) · 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.

Commit 3eb4c2be authored 5 years ago by

Ghislain Loas

Browse files

Merge branch 'origin-master' into dev#99489_magasin_de_themes_bases_sur_bootstrap

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

parents 6a13eaaa 7649f5a1

Branches

Admin message

Merge branch 'origin-master' into dev#99489_magasin_de_themes_bases_sur_bootstrap