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

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

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/product/class/product.class.php
parents 31a5a46f 9aab62ab
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment