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
..
canvas
class
agenda.php
card.php
consumption.php
document.php
index.html
info.php
ldap.php
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
perso.php
vcard.php