Laurent Destailleur 5063f29532 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/comm/mailing/class/mailing.class.php htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/product/stock/replenish.php		2021-06-17 21:35:31 +02:00
..
advtargetemailing.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-04-27 01:58:19 +02:00
html.formadvtargetemailing.class.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
mailing.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-06-17 21:35:31 +02:00