Merge branch 'master' into... (159b8461) · 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.

There was a problem fetching the pipeline stages.

Commit 159b8461 authored 7 years ago by

Laurent

Browse files

Merge branch 'master' into...

Merge branch 'master' into origin-dev#51538_1655_pouvoir_parametrer_les_jours_de_lancement_des_batchs

Conflicts:
	cosmogramme/sql/patch/patch_334.php
	tests/application/modules/admin/controllers/BatchControllerTest.php
	tests/db/UpgradeDBTest.php

parents 9c16b2e7 6009f9eb

Branches

Admin message

Merge branch 'master' into...