Laurent Destailleur 5453f99e2e Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/comm/prospect/list.php htdocs/commande/list.php htdocs/compta/facture/list.php		2016-02-27 18:33:39 +01:00
..
index.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-02-27 18:33:39 +01:00
perday.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-01-28 12:18:25 +01:00
perweek.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-01-28 12:18:25 +01:00