Skip to content
Snippets Groups Projects
Commit 3a2d07a6 authored by Ghislain Loas's avatar 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/NoticeUnimarc.php
parents 229c8ad8 8a55bb96
Branches
Tags
3 merge requests!3297WIP: Master,!3037Master,!2988Dev#64573 templates pour l interface publique libraire bootstrap
Pipeline #6386 failed with stage
in 29 minutes and 40 seconds
Showing
with 552 additions and 151 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment