Laurent Destailleur 00749b2a65 Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/imports/import.php htdocs/includes/odtphp/odf.php htdocs/product/stock/product.php htdocs/projet/list.php		2016-06-22 20:22:22 +02:00
..
doc_generic_proposal_odt.modules.php	Merge remote-tracking branch 'origin/3.9' into develop	2016-06-05 02:20:27 +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
pdf_azur.modules.php	Merge remote-tracking branch 'origin/3.9' into develop	2016-06-22 20:22:22 +02:00