Laurent Destailleur a5e9970866 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/filefunc.inc.php

2022-03-22 16:58:57 +01:00

..

doc_generic_shipment_odt.modules.php

Standardize name of button

2022-02-18 13:45:28 +01:00

pdf_espadon.modules.php

Fix position of image on line

2022-03-19 19:26:58 +01:00

pdf_merou.modules.php

Clean code on pdf templates

2021-12-02 10:43:44 +01:00

pdf_rouget.modules.php

Clean code on pdf templates

2021-12-02 10:43:44 +01:00