Laurent Destailleur a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/core/class/commonobject.class.php htdocs/core/modules/expedition/modules_expedition.php htdocs/core/modules/modContrat.class.php htdocs/expedition/class/expedition.class.php		2015-05-07 13:35:09 +02:00
..
doc	Merge remote-tracking branch 'origin/3.7' into develop	2015-05-07 13:35:09 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
mod_propale_marbre.php	Doxygen	2014-08-31 23:18:09 +02:00
mod_propale_saphir.php	Fix: Masks works with thirdparty type	2015-03-04 18:18:55 +01:00
modules_propale.php	Scrutinizer Auto-Fixes	2015-04-07 00:45:30 +00:00