Laurent Destailleur 259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php		2017-09-08 13:30:54 +02:00
..
class	Escape all status	2017-09-08 13:23:12 +02:00
advtargetemailing.php	Merge pull request #7138 from atm-florian/6.0_fix_advtargetmailing	2017-07-13 14:26:23 +02:00
card.php	NEW Include a color syntaxed HTML editor for emailing edition.	2017-09-01 13:09:13 +02:00
cibles.php	Merge emailing target selectors.	2017-08-25 21:20:27 +02:00
index.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 13:02:29 +02:00
info.php	NEW Can use translations into all substitutions (watermark, freetext...)	2017-04-17 23:54:09 +02:00
list.php	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00