Laurent Destailleur d6ecbe65b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/commonobject.class.php htdocs/langs/en_US/errors.lang		2022-05-31 15:16:54 +02:00
..
doc_generic_bom_odt.modules.php	Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-05-31 15:16:54 +02:00