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_deprecated_commande.class.php	NEW Add API for contracts	2017-10-16 17:56:59 +02:00
api_orders.class.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-22 01:43:33 +02:00
commande.class.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-22 01:43:33 +02:00
commandestats.class.php	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +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