Skip to content
Snippets Groups Projects
Commit 5e18e7a1 authored by Patrick Barroca's avatar Patrick Barroca :grin:
Browse files

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

Merge remote-tracking branch 'refs/remotes/origin/master' into origin-dev#73870_minsoc_xlst_etape_1_inspector_gadget1

Conflicts:
	library/ZendAfi/View/Helper/Notice/Unimarc.php
parents d77463c9 ed85ef55
Branches
Tags
Pipeline #3898 passed with stage
in 40 minutes and 58 seconds
Showing
with 373 additions and 31 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