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
..
ajax	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-06-18 21:13:48 +02:00
class	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-22 01:43:33 +02:00
commande	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-18 19:51:29 +02:00
facture	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-18 19:51:29 +02:00
js	Fix for 'lessone' mode	2017-09-26 15:44:40 +02:00
paiement	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-18 19:51:29 +02:00
product	USe second parameter in GETPOST	2017-09-15 10:50:50 +02:00
card.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-15 11:04:27 +02:00
contact.php	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
index.php	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
recap-fourn.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00