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

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

Conflicts:
	htdocs/product/class/product.class.php
parents db4d92cc 34468644
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment