Laurent Destailleur 67820774bb Merge remote-tracking branch 'origin/3.4' into develop ... Conflicts: ChangeLog htdocs/commande/fiche.php htdocs/core/class/extrafields.class.php htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php		2013-07-27 14:21:47 +02:00
..
pdf	Merge remote-tracking branch 'origin/3.4' into develop	2013-07-27 14:21:47 +02:00
mod_livraison_jade.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
mod_livraison_saphir.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
modules_livraison.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00