Merge branch 'stable' into hotline-master (06d5b418) · 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 06d5b418 authored 9 years ago by

Ghislain Loas

Browse files

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	application/modules/admin/controllers/AccueilController.php
	library/startup.php
	public/admin/css/global.css
	tests/application/modules/admin/controllers/AccueilControllerTest.php
	tests/application/modules/opac/controllers/NoticeAjaxControllerTest.php

parents a1911513 d7a66e43

Branches

Admin message

Merge branch 'stable' into hotline-master