Merge remote-tracking branch 'refs/remotes/origin/master' into... (a3e53d59) · 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.

Commit a3e53d59 authored 6 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_templates_pour_l_interface_publique_libraire_bootstrap

Conflicts:
	library/Class/Article.php

parents 7853730c 546231a9

Branches

Tags

3 merge requests!3297WIP: Master,!3037Master,!2988Dev#64573 templates pour l interface publique libraire bootstrap

Pipeline #6113 failed with stage

in 24 minutes and 26 seconds

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 225 additions and 20 deletions

Please register or to comment