Laurent Destailleur 6f474c403c Merge remote-tracking branch 'origin/3.8' into develop ... Conflicts: htdocs/commande/class/commande.class.php htdocs/filefunc.inc.php htdocs/product/list.php htdocs/societe/notify/card.php htdocs/societe/price.php		2015-12-27 19:15:20 +01:00
..
card.php	Merge remote-tracking branch 'origin/3.8' into develop	2015-12-27 19:15:20 +01:00
index.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +02:00