Laurent Destailleur 361f13154b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/functions2.lib.php htdocs/fourn/card.php htdocs/margin/tabs/thirdpartyMargins.php htdocs/societe/card.php htdocs/societe/note.php htdocs/societe/notify/card.php htdocs/societe/societecontact.php htdocs/ticket/list.php		2020-12-20 14:31:54 +01:00
..
api_contacts.class.php	Fix api contact	2020-11-24 12:03:31 +01:00
api_thirdparties.class.php	Clean API	2020-12-04 23:55:47 +01:00
client.class.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
companybankaccount.class.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
companypaymentmode.class.php	doxygen	2020-12-05 23:53:55 +01:00
index.html
societe.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-12-20 14:31:54 +01:00
societeaccount.class.php	Update societeaccount.class.php	2020-12-07 22:30:24 +01:00