Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Conflicts:
	htdocs/product/reassort.php
This commit is contained in:
Laurent Destailleur 2020-01-04 14:27:16 +01:00
commit 1a84f54b06

Diff Content Not Available