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

Patrick Barroca

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

Conflicts:
	VERSIONS
	ckeditor/core_five_filemanager/connectors/php/filemanager.config.php
	library/Class/FileManager.php
	library/startup.php

parents 24f55d9e b66adccf

Branches

Tags

3 merge requests!2420Hotline master,!2415Master,!2414Hotline master

Hide whitespace changes

Inline Side-by-side

Showing with 19 additions and 126 deletions

Please register or to comment