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

Conflicts:
	htdocs/api/index.php
	htdocs/comm/propal/class/api_proposals.class.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/class/api_invoices.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/actions_sendmails.inc.php

2017-10-22 01:43:33 +02:00

..

doc_generic_odt.modules.php

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

2017-10-22 01:43:33 +02:00

index.html

…