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	Merge remote-tracking branch 'origin/3.3' into develop	2013-03-16 17:07:35 +01:00
mod_propale_marbre.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
mod_propale_saphir.php	Prepare move to other licence. For the moment all answers for licence	2013-01-16 15:36:08 +01:00
modules_propale.php	Fix: $hookmanager is a global object	2013-01-26 10:35:30 +01:00