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

..

api_access.class.php

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

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

api_dictionary.class.php

NEW Get the list of payments terms

2017-09-27 12:34:41 +02:00

api_documents.class.php

Move function colorIsLight into functions.lib.php

2017-10-16 09:29:10 +02:00

api_login.class.php

Fix API was loading definition of all APIs at each call.

2017-06-25 17:09:08 +02:00

api_status.class.php

Merge branch 'refactor-rest-api' of

2016-07-27 14:06:14 +02:00

api.class.php

Add API close to close an order

2017-10-18 15:34:03 +02:00

index.html

Create index.html

2015-10-18 10:07:08 +02:00