Laurent Destailleur 58cd7c97a5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ...

Conflicts:
	htdocs/comm/mailing/card.php
	htdocs/comm/mailing/cibles.php
	htdocs/comm/mailing/class/mailing.class.php

2020-12-24 13:05:17 +01:00

..

mailing-send.php

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

2020-12-24 13:05:17 +01:00

reset-invalid-emails.php

Fix phpcs

2020-12-04 01:59:47 +01:00