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
4 merge requests!2660Master,!2596Master,!2595Master,!2593Dev#73870 minsoc xlst etape 1 inspector gadget1
Pipeline #3898 passed with stage
in 40 minutes and 58 seconds
Status
Pipeline
Created by
Stages
Actions
Passed

00:40:58

avatar

No artifacts found