Laurent Destailleur 157b17b6d5 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ...

Conflicts:
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/errors.lang

2017-01-03 01:31:58 +01:00

..

doc

Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0

2017-01-03 01:31:58 +01: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