Laurent Destailleur 4c1aa25b32 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/admin/adherent_emails.php htdocs/core/tpl/extrafields_list_search_title.tpl.php htdocs/product/traduction.php		2020-08-04 13:51:11 +02:00
..
api_zapier.class.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00
hook.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-08-04 13:51:11 +02:00