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
..
class	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-02-15 01:37:23 +01:00
stats	Fix select2 component go over parent container so we introduce option to	2016-01-08 23:17:45 +01:00
tpl	FIX Bug: Delivery order and date are not displayed #4372	2016-01-13 20:41:32 +01:00
card.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-02-15 01:37:23 +01:00
contact.php	FIX #3534	2015-09-16 22:04:03 +02:00
index.php	Fix search on shipment	2016-01-08 23:59:02 +01:00
list.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-01-30 15:59:40 +01:00
note.php	Bad width	2015-01-23 18:41:53 +01:00
shipment.php	Fix: a badge css was found into an array	2016-01-08 17:23:25 +01:00