Laurent Destailleur a60cd49fb0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/core/class/CMailFile.class.php htdocs/filefunc.inc.php		2017-08-28 12:53:02 +02:00
..
class	FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes	2017-07-26 21:22:53 +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	Fix substitution of __EMAIL__	2017-08-28 12:49:57 +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