Merge branch 'master' into dev#17514_indexation_refactoring (1f0e4f95) · 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 1f0e4f95 authored 10 years ago by

Ghislain Loas

Browse files

Merge branch 'master' into dev#17514_indexation_refactoring

Conflicts:
	application/modules/opac/controllers/RechercheController.php
	cosmogramme/php/_init.php
	library/Class/Notice.php
	library/Class/PanierNotice.php
	library/Class/Users.php
	tests/application/modules/admin/controllers/CmsControllerTest.php
	tests/application/modules/opac/controllers/PanierControllerTest.php
	tests/application/modules/opac/controllers/RechercheControllerTest.php

parents 6f12f444 5811c1d6

Branches

Admin message

Merge branch 'master' into dev#17514_indexation_refactoring