Laurent Destailleur 476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/subscription/list.php htdocs/comm/action/index.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php htdocs/cron/class/cronjob.class.php htdocs/eventorganization/class/conferenceorbooth.class.php htdocs/modulebuilder/template/myobject_list.php htdocs/public/ticket/list.php htdocs/supplier_proposal/list.php htdocs/ticket/class/ticket.class.php		2023-05-17 00:57:17 +02:00
..
doc	Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop	2023-05-17 00:57:17 +02:00
mod_commande_marbre.php	Fix trans in comments	2022-10-12 15:29:30 +02:00
mod_commande_saphir.php	doc translation	2022-12-21 17:23:33 +01:00
modules_commande.php	Declare properties	2023-04-27 23:01:34 +02:00