Merge branch 'origin-stable' into hotline-master (74584827) · Commits · Quentin CHEVILLON / 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 74584827 authored 9 years ago by

Laurent

Browse files

Merge branch 'origin-stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php
	tests/library/ZendAfi/View/Helper/Admin/MenuGaucheAdminTest.php

parents 6d8f0d1f bcebbbe2

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 88 additions and 48 deletions

Please register or to comment

Admin message

Merge branch 'origin-stable' into hotline-master