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

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

Conflicts:
	htdocs/admin/company.php
	htdocs/admin/menus/edit.php
	htdocs/core/class/hookmanager.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
parents 69757210 758b8e1f
No related branches found
No related tags found
No related merge requests found
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 203 additions and 860 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment