Laurent Destailleur 12681994ea Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: ChangeLog htdocs/comm/propal.php htdocs/commande/fiche.php htdocs/compta/facture.php htdocs/fichinter/class/fichinter.class.php htdocs/fichinter/fiche.php		2013-05-20 21:21:03 +02:00
..
fichinter.class.php	Merge remote-tracking branch 'origin/3.4' into develop	2013-05-20 21:21:03 +02:00