Laurent Destailleur 480b09f192 Merge remote-tracking branch 'origin/3.5' into develop ... Conflicts: ChangeLog htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/societe/class/societe.class.php		2014-02-26 15:49:29 +01:00
..
class	Translated export filters	2014-02-25 03:23:08 +01:00
export.php	Merge remote-tracking branch 'origin/3.5' into develop	2014-02-26 15:49:29 +01:00
index.php	Fix: EOF	2013-06-05 16:24:32 +02:00