Laurent Destailleur 33a7692fbc Merge remote-tracking branch 'origin/3.3' into develop ... Conflicts: htdocs/core/menus/standard/eldy.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/exports/class/export.class.php		2013-03-16 17:07:35 +01:00
..
doc_generic_proposal_odt.modules.php	Move substitution function for propal to common class & add extrafields display	2013-03-05 08:38:41 +01:00
pdf_azur.modules.php	Merge remote-tracking branch 'origin/3.3' into develop	2013-03-16 17:07:35 +01:00