Laurent Destailleur 95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/propal/card.php htdocs/commande/card.php htdocs/emailcollector/class/emailcollector.class.php htdocs/index.php htdocs/website/index.php		2022-08-10 13:16:02 +02:00
..
emailcollector.class.php	Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop	2022-08-10 13:16:02 +02:00
emailcollectoraction.class.php	Debug v16	2022-06-28 13:09:53 +02:00
emailcollectorfilter.class.php	Debug v16	2022-06-28 13:09:53 +02:00