Laurent Destailleur 9d3bd9d36f Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/langs/en_US/errors.lang

2016-12-18 11:57:04 +01:00

..

index.html

…

supplier_proposal.class.php

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

2016-12-18 11:57:04 +01:00