Laurent Destailleur c635baa848 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/langs/en_US/errors.lang		2017-01-03 01:34:15 +01:00
..
doc	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-01-03 01:34:15 +01: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