Skip to content
Snippets Groups Projects
Commit 6e39d834 authored by Juanjo Menent's avatar Juanjo Menent
Browse files

Merge remote-tracking branch 'upstream/3.9' into develop 

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php
parents 858291c3 e3c2299c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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