Laurent Destailleur f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/api_commande.class.php htdocs/compta/facture/class/api_invoice.class.php htdocs/product/class/api_product.class.php htdocs/societe/class/api_contact.class.php htdocs/societe/class/api_thirdparty.class.php		2016-08-02 17:43:12 +02:00
..
address.class.php	[Qual] Constructors of deprecated classes are deprecated	2015-09-24 20:35:59 +02:00
api_contacts.class.php	REST API: improve the API to get/add categories for an item.	2016-06-20 17:56:33 +02:00
api_deprecated_contact.class.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-02 17:43:12 +02:00
api_deprecated_thirdparty.class.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-02 17:43:12 +02:00
api_thirdparties.class.php	Merge branch 'refactor-rest-api' of	2016-07-27 14:06:14 +02:00
client.class.php	[Qual] Cleanup of inherited class properties	2015-09-24 20:12:55 +02:00
companybankaccount.class.php	Fix #5353	2016-06-30 15:49:57 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
societe.class.php	Merge remote-tracking branch 'origin/4.0' into develop	2016-08-01 15:15:32 +02:00