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

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

Conflicts:
	htdocs/fourn/class/fournisseur.product.class.php
parents 51d275ee 3c8d54d5
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