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
..
class	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2020-12-24 13:05:17 +01:00
advtargetemailing.php	replace deprecated	2020-10-22 22:50:03 +02:00
card.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2020-12-24 13:05:17 +01:00
cibles.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2020-12-24 13:05:17 +01:00
index.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
info.php	end of dol_fiche_end	2020-10-27 18:19:31 +01:00
list.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00