Laurent Destailleur b57476153f Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/admin/menus/edit.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/societe/consumption.php		2016-06-04 01:14:36 +02:00
..
doc	Merge remote-tracking branch 'origin/3.9' into develop	2016-06-04 01:14:36 +02:00
index.html
mod_propale_marbre.php
mod_propale_saphir.php	Revert "Fix regression"	2016-03-25 15:57:19 +01:00
modules_propale.php	Qual: added deprecation hinting	2015-06-01 11:00:11 +02:00