Merge branch 'stable' into hotline-master (442cd7ff) · 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 442cd7ff authored 10 years ago by

Ghislain Loas

Merge branch 'stable' into hotline-master

Conflicts:
	VERSIONS
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_236.php
	library/startup.php
	public/opac/css/global.css

parents 40706868 f35fad40

Branches

Tags

4 merge requests!896Master,!893Master,!878Hotline master,!869Master

Hide whitespace changes

Inline Side-by-side

Showing with 2 additions and 0 deletions

Please register or to comment