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

Merge branch 'dev#59152_videos_de_bokeh_dans_l_admin'

Conflicts:
	public/admin/css/global.css
	public/admin/skins/bokeh74/global.css
	public/admin/skins/retro/global.css
parents 6ee36e11 5634eebb
Branches
Tags
1 merge request!2334Master
Pipeline #1113 passed with stage
in 16 minutes and 11 seconds
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