Laurent Destailleur bbd3734a21 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/facture/list.php
	htdocs/filefunc.inc.php

2016-12-26 12:42:23 +01:00

..

doc

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

2016-12-26 12:42:23 +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

…