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

Merge remote-tracking branch 'refs/remotes/origin/stable'

Conflicts:
	public/admin/css/global.css
	public/admin/skins/bokeh74/global.css
parents c6300464 cd282f0a
Branches
Tags
2 merge requests!2435Master,!2434Master
Pipeline #3084 passed with stage
in 28 minutes and 4 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