Merge branch 'origin-hotline-master' into origin-master (ea044a49) · 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 ea044a49 authored 8 years ago by

Ghislain Loas

Browse files

Merge branch 'origin-hotline-master' into origin-master

Conflicts:
	application/modules/admin/controllers/MenusController.php

parents 863907f7 e0aa1adf

2 merge requests!1797Master,!1778Master

Hide whitespace changes

Inline Side-by-side

Showing with 147 additions and 114 deletions

Please register or to comment

Admin message

Merge branch 'origin-hotline-master' into origin-master