Merge remote-tracking branch 'refs/remotes/origin/master' into... (8a955cf1) · Commits · afi / opacce

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.

Commit 8a955cf1 authored 6 years ago by

Ghislain Loas

Browse files

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

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

Conflicts:
	library/Class/Article.php
	library/ZendAfi/View/Helper/AuthorAnchor.php

parents c38c7fe9 f3d22d3c

Pipeline #5638 failed with stage

in 28 minutes and 8 seconds

Hide whitespace changes

Inline Side-by-side

Showing with 514 additions and 30 deletions

Please register or to comment

Admin message

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