Laurent Destailleur 29e6d01e51 Merge remote-tracking branch 'origin/3.3' into develop ... Conflicts: htdocs/core/tpl/freeproductline_create.tpl.php htdocs/core/tpl/predefinedproductline_create.tpl.php		2013-01-13 19:33:54 +01:00
..
doc	Merge remote-tracking branch 'origin/3.3' into develop	2013-01-13 19:33:54 +01:00
mod_propale_marbre.php	Fix: change for a neutral email	2012-12-30 15:13:49 +01:00
mod_propale_saphir.php	Fix: change for a neutral email	2012-12-30 15:13:49 +01:00
modules_propale.php	Fix: change for a neutral email	2012-12-30 15:13:49 +01:00