Skip to content
Snippets Groups Projects
Commit 4a88c9ea 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 a209d186 3fea57f8
Branches
No related tags found
No related merge requests found
Showing
with 0 additions and 8 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment