Skip to content
Snippets Groups Projects
Commit 32778e15 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 dev#57952_cip_priorisation_des_ecrans_de_config

Conflicts:
	public/opac/js/input_connect_list/input_connect_list.js
parents 0ac482b8 f14a3372
Branches
Tags
2 merge requests!2334Master,!2079Dev#57952 cip priorisation des ecrans de config
Pipeline #1016 failed with stage
in 14 minutes and 28 seconds
Showing
with 137 additions and 44 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