Laurent Destailleur df9a6dae6c Merge remote-tracking branch 'origin/3.6' into 3.7 ... Conflicts: htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php htdocs/core/tpl/objectline_create.tpl.php htdocs/fichinter/fiche.php		2014-11-28 02:20:01 +01:00
..
doc	Merge remote-tracking branch 'origin/3.6' into 3.7	2014-11-28 02:20:01 +01:00
index.html
mod_commande_marbre.php
mod_commande_saphir.php
modules_commande.php	Created a method generateDocument for several classes	2014-09-16 12:30:37 +02:00