Laurent Destailleur 5455ab3280 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ...

Conflicts:
	htdocs/projet/card.php

2018-02-04 23:17:09 +01:00

..

doc

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0

2018-02-04 23:17:09 +01:00

index.html

…

mod_propale_marbre.php

Fix regression db => this->db

2017-09-15 19:37:23 +02:00

mod_propale_saphir.php

Fix problem in type and customer code substitution in numbering module

2017-09-06 10:11:07 +02:00

modules_propale.php

…