Laurent Destailleur 8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/core/tpl/contacts.tpl.php		2020-03-18 18:50:55 +01:00
..
index.php	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-03-18 18:50:55 +01:00