Laurent Destailleur e9ba9fc103 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/list.php htdocs/core/modules/mailings/modules_mailings.php		2021-10-26 13:52:00 +02:00
..
delivery.class.php	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-10-26 13:52:00 +02:00