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

Conflicts:
	htdocs/cron/card.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php

2016-09-09 09:32:14 +02:00

..

doc

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

2016-09-09 09:32:14 +02:00

index.html

…

mod_supplier_proposal_marbre.php

…

mod_supplier_proposal_saphir.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

modules_supplier_proposal.php

…