Merge remote-tracking branch 'refs/remotes/origin/master' into... (97062fd0) · 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 97062fd0 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#73871_minsoc_xlst_etape_2_association_fichier_xslt

Conflicts:
	library/Class/AdminVar.php
	library/ZendAfi/View/Helper/Notice/Unimarc.php

parents 45fc671b ed85ef55

Branches

Tags

5 merge requests!2660Master,!2616Dev#73871 minsoc xlst etape 2 association fichier xslt,!2601Dev#73871 minsoc xlst etape 2 association fichier xslt,!2597Dev#73871 minsoc xlst etape 2 association fichier xslt,!2589Dev#73871 minsoc xlst etape 2 association fichier xslt

Pipeline #3897 passed with stage

in 39 minutes and 21 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 373 additions and 31 deletions

Please register or to comment