Merge branch 'stable' into hotline-master (c680a1d7) · Commits · afi / opacce · GitLab

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 c680a1d7 authored 8 years ago by

Ghislain Loas

Merge branch 'stable' into hotline-master

Conflicts:
	tests/application/modules/admin/controllers/CatalogueControllerTest.php

parents a8ec2138 02c5cdc5

Branches

Tags

2 merge requests!1864Master,!1863Hotline master

Hide whitespace changes

Inline Side-by-side

Showing with 60 additions and 59 deletions

Please register or to comment