Laurent Destailleur 5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/core/class/html.formprojet.class.php htdocs/core/menus/standard/eldy.lib.php htdocs/filefunc.inc.php htdocs/langs/en_US/accountancy.lang		2016-02-09 14:40:25 +01:00
..
doc	Merge remote-tracking branch 'origin/3.9' into develop	2016-02-09 14:40:25 +01:00
index.html
mod_supplier_proposal_marbre.php
mod_supplier_proposal_saphir.php
modules_supplier_proposal.php