Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 · Dolibarr/dolibarr@ef00cb0 · GitHub

Commit

Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

Browse files

Conflicts:
	htdocs/fourn/class/fournisseur.commande.class.php

Loading branch information

eldy committed Jan 10, 2020

2 parents 24c499a + d7f7f5b commit ef00cb0