Merge branch 'master' into origin-dev#86039_pairing_contractuel_bdp89_specs_pret_malle (51cc941b) · 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 51cc941b authored 5 years ago by

Laurent

Browse files

Merge branch 'master' into origin-dev#86039_pairing_contractuel_bdp89_specs_pret_malle

Conflicts:
	cosmogramme/cosmozend/tests/application/modules/cosmo/controllers/DataProfileControllerTest.php
	cosmogramme/php/fonctions/objets_saisie.php
	cosmogramme/sql/patch/patch_377.php
	tests/db/UpgradeDBTest.php

parents d8f755e1 08867007

Pipeline #8247 failed with stage

in 30 minutes and 47 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 304 additions and 48 deletions

Please register or to comment

Admin message

Merge branch 'master' into origin-dev#86039_pairing_contractuel_bdp89_specs_pret_malle