Laurent Destailleur 9fdba921b4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ...

Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php

2019-01-30 16:48:33 +01:00

..

index.html

…

productMargins.php

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

2019-01-30 16:48:33 +01:00

thirdpartyMargins.php

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

2018-11-08 20:19:28 +01:00