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

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

Conflicts:
	htdocs/product/stock/product.php
parents 8b3faf46 dc0d12ec
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 249 additions and 211 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment