Merge branch 'dev#30936_dev30936_cdscript_import' (9fcbbbd4) · 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 9fcbbbd4 authored 9 years ago by

Ghislain Loas

Browse files

Merge branch 'dev#30936_dev30936_cdscript_import'

Conflicts:
	cosmogramme/php/_init.php
	cosmogramme/sql/patch/patch_276.php
	cosmogramme/tests/php/classes/NoticeIntegrationTest.php
	tests/db/UpgradeDBTest.php

parents 87c37069 55656e5e

Branches

Admin message

Merge branch 'dev#30936_dev30936_cdscript_import'