Skip to content
Snippets Groups Projects
Commit 28d7455b authored by Ghislain Loas's avatar Ghislain Loas
Browse files

Merge branch 'origin-master' into origin-dev#75244_connecteur_les_yeux_du_doc_les_yeux_du_doc

Conflicts:
	library/Class/DigitalResource/Config.php
parents 97586890 924fe6b0
Branches
Tags
3 merge requests!2684Master,!2681Dev#75244 connecteur les yeux du doc les yeux du doc,!2666Dev#75244 connecteur les yeux du doc les yeux du doc
Pipeline #4274 passed with stage
in 37 minutes and 2 seconds
Showing
with 95 additions and 77 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