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
..
admin	Look and feel v6	2017-05-18 13:13:18 +02:00
class	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-22 01:43:33 +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 14:50:52 +02:00
document.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00
index.php	Missing translation	2017-09-11 02:54:06 +02:00
info.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +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 14:50:52 +02:00
services.php	Scrutinizer Auto-Fixes	2017-10-13 11:28:26 +00:00