Merge remote-tracking branch 'refs/remotes/origin/master' into... (5bf618d9) · 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 pipeline stages.

Commit 5bf618d9 authored 6 years ago by

Patrick Barroca

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

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#70388_planif_contractuel_minsoc__formulaire_gerer_le_rendu_cote_back

Conflicts:
	library/Class/AdminVar.php

parents 124bb422 ed85ef55

Branches

Tags

4 merge requests!2660Master,!2600Master,!2599Dev#70388 planif contractuel minsoc formulaire gerer le rendu cote back,!2598Dev#70388 planif contractuel minsoc formulaire gerer le rendu cote back

Pipeline #3903 failed with stage

in 37 minutes and 47 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 355 additions and 79 deletions

Please register or to comment