Laurent Destailleur 90ddfc3f7f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/admin/translation.php

2018-01-11 01:14:20 +01:00

..

doc

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

2018-01-11 01:14:20 +01:00

index.html

…

mod_contract_magre.php

…

mod_contract_olive.php

…

mod_contract_serpis.php

Fix regression db => this->db

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

modules_contract.php

…