Laurent Destailleur 87a19af86d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_massactions.inc.php htdocs/core/tpl/contacts.tpl.php		2021-06-15 22:17:53 +02:00
..
tpl	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-06-15 22:17:53 +02:00
actions_card_service.class.php	Fix yogosha 6347	2021-06-09 15:36:47 +02:00