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

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/projet/tasks/time.php

2024-07-13 17:47:55 +02:00

..

doc_generic_shipment_odt.modules.php

Replace "! empty($conf->global->$" with "getDolGlobalString($"

2024-07-03 20:05:29 +02:00

pdf_espadon.modules.php

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

2024-07-13 17:47:55 +02:00

pdf_merou.modules.php

fix phpstan (#30319)

2024-07-08 21:45:35 +02:00

pdf_rouget.modules.php

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

2024-07-13 17:47:55 +02:00