Laurent Destailleur 675e761297 Merge branch '20.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php

2024-06-30 04:11:04 +02:00

..

productMargins.php

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

2024-06-30 04:11:04 +02:00

thirdpartyMargins.php

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

2024-06-30 04:11:04 +02:00