Merge remote-tracking branch 'refs/remotes/afi/master' into... (57aa0997) · Commits · afi / opacce · GitLab

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 latest pipeline status.

Commit 57aa0997 authored 7 years ago by

Patrick Barroca

Merge remote-tracking branch 'refs/remotes/afi/master' into...

Merge remote-tracking branch 'refs/remotes/afi/master' into afi-dev#40650_contractuel_5255_dole_preinscription_en_ligne_bressuire_concarneau_ccvh

# Conflicts:
#	cosmogramme/php/config_integrations.php

parents 4f6460fa 052336cf

Branches

Tags

3 merge requests!2334Master,!2161Dev#40650 contractuel 5255 dole preinscription en ligne bressuire concarneau ccvh,!2157Dev#40650 contractuel 5255 dole preinscription en ligne bressuire concarneau ccvh

Pipeline #1499 passed with stage

in 12 minutes and 21 seconds

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 606 additions and 621 deletions

Please register or to comment