Merge branch 'master' into origin-sandbox_gladys_suggests (3d9fa471) · 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 3d9fa471 authored 9 years ago by

Laurent

Browse files

Merge branch 'master' into origin-sandbox_gladys_suggests

Conflicts:
	library/Class/MoteurRecherche/Facettes.php
	library/ZendAfi/Form/Configuration/SearchResult.php
	tests/application/modules/admin/controllers/ModulesControllerTest.php
	tests/library/Class/MoteurRecherche/MoteurRechercheFacettesTest.php

parents 3032c67a 3917a83b

Branches

Admin message

Merge branch 'master' into origin-sandbox_gladys_suggests