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

Merge remote-tracking branch 'origin/3.9' into develop

2016-06-22 20:22:22 +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

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