htdocs/api/class/api_access.class.php · f67863e1aadbb10b5d76693549f6f1b7249c4115 · Software_Artifact_Infrastructure_Repository / dolibarr

8 years ago

Merge branch 'rest-api-add-accounts' of · 3cb13e16

Laurent Destailleur authored 8 years ago

https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-rest-api-add-accounts

Conflicts:
	htdocs/api/index.php
	htdocs/commande/class/api_orders.class.php

3cb13e16

History

Merge branch 'rest-api-add-accounts' of

Laurent Destailleur authored 8 years ago

https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-rest-api-add-accounts

Conflicts:
	htdocs/api/index.php
	htdocs/commande/class/api_orders.class.php