Merge branch 'stable' (42183e1b) · 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 42183e1b authored 10 years ago by

Ghislain Loas

Browse files

Merge branch 'stable'

Conflicts:
	VERSIONS
	cosmogramme/sql/patch/patch_229.php
	library/startup.php

parents 228c0c01 e0a3b410

Branches

Tags 7.1.2

2 merge requests!715Master,!664report fix from stable to wip

Hide whitespace changes

Inline Side-by-side

Showing with 233 additions and 99 deletions

Please register or to comment

Admin message

Merge branch 'stable'