Merge remote-tracking branch 'refs/remotes/origin/master' into... (3a188ede) · 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 3a188ede authored 7 years ago by

Ghislain Loas

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

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#64573_amelioration_de_la_charte_modele

Conflicts:
	library/ZendAfi/Controller/Plugin/Manager/FileManager.php

parents cb5ebd8c a9dc73d2

Branches

Tags

6 merge requests!2767Hotline,!2742Dev#64573 amelioration de la charte modele,!2724Dev#64573 amelioration de la charte modele,!2718Dev#64573 amelioration de la charte modele,!2679Dev#64573 amelioration de la charte modele,!2439WIP Dev#64573 amelioration de la charte modele

Pipeline #3820 passed with stage

in 32 minutes and 56 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 304 additions and 182 deletions

Please register or to comment