Merge branch 'stable' into hotline-master (1a53f69f) · Commits · efalcy / 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 1a53f69f authored 10 years ago by

Ghislain Loas

Browse files

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php

parents 5a13730a 4e8ac510

Branches

Tags 7.5.17

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 316 additions and 185 deletions

Please register or to comment

Admin message

Merge branch 'stable' into hotline-master