Merge remote-tracking branch 'origin/Dev#17629_Domains' (abd2b957) · 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 abd2b957 authored 10 years ago by

Alex Arnaud

Browse files

Merge remote-tracking branch 'origin/Dev#17629_Domains'

Conflictsi solved:
	application/modules/opac/controllers/RechercheController.php
	cosmogramme/php/_init.php
	library/Class/Notice.php
	library/Class/PanierNotice.php
	library/ZendAfi/Form/Album.php
	tests/application/modules/admin/controllers/CmsControllerTest.php
	tests/application/modules/opac/controllers/RechercheControllerTest.php

parents 68229289 0dcdcef5

Branches

Admin message

Merge remote-tracking branch 'origin/Dev#17629_Domains'