Merge remote-tracking branch 'origin/master' into origin-dev#30936_dev30936_cdscript_import (49f7bbcf) · 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 49f7bbcf authored 9 years ago by

Ghislain Loas

Browse files

Merge remote-tracking branch 'origin/master' into origin-dev#30936_dev30936_cdscript_import

Conflicts:
	cosmogramme/sql/patch/patch_275.php

parents fa5e6e8b a42c4d0a

Branches

Admin message

Merge remote-tracking branch 'origin/master' into origin-dev#30936_dev30936_cdscript_import