Merge remote-tracking branch 'refs/remotes/origin/master' into... (08a399be) · 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 08a399be authored 8 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#45275_3155_contractuel_application_nouvelle_methode_d_edition_par_lot_des_articles_aux_collections

# Conflicts:
#	public/admin/css/global.css
#	public/admin/skins/bokeh74/global.css

parents 6acb5713 8ab70994

Branches

Tags

4 merge requests!2080Sandbox detach zf from storm,!2061Master,!1989Dev#45275 3155 contractuel application nouvelle methode d edition par lot des articles aux collections,!1959Dev#45275 3155 contractuel application nouvelle methode d edition par lot des articles aux collections

Pipeline #218 passed with stage

in 10 minutes and 39 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 485 additions and 22 deletions

Please register or to comment