Laurent Destailleur fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/contact/list.php htdocs/core/modules/mailings/modules_mailings.php		2021-10-26 13:29:47 +02:00
..
index.html	Fix restore dir at good place	2020-04-13 04:19:25 +02:00
mailing-read.php	Fix unsubscribe to MLs	2021-03-05 17:48:55 +01:00
mailing-unsubscribe.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-10-26 13:29:47 +02:00