Laurent Destailleur 28a1b7af35 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/modulebuilder/index.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php

2020-04-03 18:07:24 +02:00

..

advtargetemailing.class.php

Clean dead code

2020-04-02 12:03:29 +02:00

html.formadvtargetemailing.class.php

Scrutinizer Auto-Fixes

2020-02-18 22:47:25 +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

FIX cloning of emailing when no content selected

2020-04-03 02:29:10 +02:00