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

Ghislain Loas

Browse files

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

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_308.php
	library/Class/CodifThesaurus.php
	library/translation/es.mo
	tests/db/UpgradeDBTest.php

parents 8d20ea4a 694e90db

Branches

Admin message

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