Laurent Destailleur c54294285a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/mailing/class/html.formadvtargetemailing.class.php htdocs/core/class/commonobject.class.php htdocs/core/class/html.form.class.php		2020-06-20 12:28:14 +02:00
..
advtargetemailing.class.php	add new rule	2020-05-21 15:05:19 +02:00
html.formadvtargetemailing.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-20 12:28:14 +02: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	add new rule	2020-05-21 15:05:19 +02:00