Laurent Destailleur 8e9c1c4747 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/commande/card.php htdocs/commande/class/commande.class.php htdocs/commande/list.php htdocs/core/class/notify.class.php htdocs/core/login/functions_dolibarr.php htdocs/exports/export.php htdocs/langs/en_US/admin.lang		2015-04-01 16:33:39 +02:00
..
class	Merge pull request #2449 from defrance69/patch-51	2015-03-22 14:07:05 +01:00
export.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-04-01 16:33:39 +02:00
index.php	Correct	2014-11-25 20:40:00 +01:00