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

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

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
parents fc449324 ef8b5557
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 161 additions and 32 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment