Merge remote-tracking branch 'origin/stable' into hotline-master (c82b2079) · 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 c82b2079 authored 9 years ago by

Matthias Meusburger

Browse files

Merge remote-tracking branch 'origin/stable' into hotline-master

Conflicts:
	VERSIONS
	library/startup.php

parents 8024caf9 aa45aa16

1 merge request!896Master

Hide whitespace changes

Inline Side-by-side

Showing with 569 additions and 140 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/stable' into hotline-master