Laurent Destailleur 4584fa1aa6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/asset/list.php htdocs/compta/bank/list.php htdocs/contrat/services_list.php htdocs/core/lib/date.lib.php htdocs/expensereport/list.php htdocs/fichinter/list.php htdocs/holiday/list.php htdocs/projet/tasks/list.php htdocs/supplier_proposal/list.php htdocs/user/list.php		2020-05-11 19:43:06 +02:00
..
stats	Look and feel v12	2020-04-25 17:43:12 +02:00
comment.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
contact.php	Look and feel v12	2020-04-25 17:43:12 +02:00
document.php	Clean code	2020-04-20 15:06:27 +02:00
list.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-11 19:43:06 +02:00
note.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
task.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
time.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-11 19:43:06 +02:00