Laurent Destailleur 3bcc7b0f8f Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/comm/remise.php htdocs/expedition/card.php htdocs/expedition/class/expedition.class.php htdocs/filefunc.inc.php htdocs/societe/price.php		2016-02-15 01:37:23 +01:00
..
mailing-send.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-02-15 01:37:23 +01:00