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

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

Conflicts:
	htdocs/core/class/infobox.class.php
parents 7b0897a6 67758c96
No related branches found
No related tags found
No related merge requests found
Showing
with 53 additions and 35 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment