Laurent Destailleur 386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php

2019-08-15 23:39:02 +02:00

..

doc

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

2019-08-15 23:39:02 +02:00

index.html

…

mod_contract_magre.php

Update mod_contract_magre.php

2019-04-20 09:31:53 +02:00

mod_contract_olive.php

replace @public by @var

2019-04-18 18:41:02 +02:00

mod_contract_serpis.php

replace @public by @var

2019-04-18 18:41:02 +02:00

modules_contract.php

wip

2019-02-25 21:36:27 +01:00