Skip to content
Snippets Groups Projects
Commit 1c280a92 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge remote-tracking branch 'origin/3.7' into develop 

Conflicts:
	htdocs/theme/eldy/style.css.php
parents f58bd370 1a2bde14
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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