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

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

Conflicts:
	htdocs/fourn/facture/card.php
	htdocs/langs/en_US/products.lang
	htdocs/societe/list.php
parents 7519c4a6 ee420b79
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment