Laurent Destailleur 1d04ce2185 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/core/lib/functions.lib.php

2018-10-09 17:07:32 +02:00

..

index.html

…

productMargins.php

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

2018-10-09 17:07:32 +02:00

thirdpartyMargins.php

Replace multiple load calls with loadLangs method

2018-10-01 09:22:23 +03:00