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

Merge remote-tracking branch 'refs/remotes/origin/dev#57952_cip_priorisation_des_ecrans_de_config'

Conflicts:
	library/ZendAfi/View/Helper/Admin/RenderForm.php
	public/admin/skins/bokeh74/colors.css
	public/admin/skins/bokeh74/global.css
parents 10a1db04 7a00e4de
Branches
Tags
1 merge request!2334Master
Pipeline #1120 passed with stage
in 18 minutes and 9 seconds