Laurent Destailleur df7cdd1da8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 ... Conflicts: htdocs/admin/tools/export_files.php htdocs/comm/mailing/class/advtargetemailing.class.php htdocs/core/tpl/advtarget.tpl.php		2020-02-08 15:42:35 +01:00
..
advtargetemailing.class.php	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-02-08 15:42:35 +01:00
html.formadvtargetemailing.class.php	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0	2020-02-08 15:42:35 +01: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 'develop' into new_branch_01_11_2019	2019-11-02 12:00:04 +01:00