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

..

class

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

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

stats

Update code using new css class

2017-05-15 16:25:51 +02:00

tpl

Replace usage of $bc[$var] with class="oddeven"

2017-04-14 11:22:48 +02:00

card.php

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

2017-10-18 19:51:29 +02:00

contact.php

NEW Search filters in lists are restored when using "back to list"

2017-10-03 16:00:52 +02:00

index.php

New: getEntity function use true $shared value by default

2017-05-30 18:50:54 +02:00

list.php

Scrutinizer Auto-Fixes

2017-10-13 11:28:26 +00:00

note.php

NEW Search filters in lists are restored when using "back to list"

2017-10-03 16:00:52 +02:00

shipment.php

NEW Search filters in lists are restored when using "back to list"

2017-10-03 16:00:52 +02:00