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_proposal_odt.modules.php

Standardize name of button

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

pdf_azur.modules.php

FIX #19939

2022-02-04 13:18:07 +01:00

pdf_cyan.modules.php

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

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