Merge branch 'master' into... (a8b18319) · 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 a8b18319 authored 7 years ago by

Laurent

Merge branch 'master' into...

Merge branch 'master' into origin-dev#66057_bonus_utiliser_la_grande_image_plutot_que_la_vignette_en_affichage_notice

Conflicts:
	library/ZendAfi/View/Helper/Notice/Vignette.php

parents 8b07e986 746a79fc

Branches

Tags

2 merge requests!2379Dev#66057 bonus utiliser la grande image plutot que la vignette en affichage notice,!2372Dev#66057 bonus utiliser la grande image plutot que la vignette en affichage notice

Pipeline #2740 failed with stage

in 21 minutes and 23 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 168 additions and 43 deletions

Please register or to comment