Laurent Destailleur 90b5ed9908 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/website.lib.php		2020-06-11 23:41:35 +02:00
..
api_contacts.class.php	add new rule	2020-05-21 15:05:19 +02:00
api_thirdparties.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-28 20:20:39 +02:00
client.class.php	add new rule	2020-05-21 15:05:19 +02:00
companybankaccount.class.php	add new rule	2020-05-21 15:05:19 +02:00
companypaymentmode.class.php	add new rule	2020-05-21 15:05:19 +02:00
index.html
societe.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-11 23:41:35 +02:00
societeaccount.class.php	add new rule	2020-05-21 15:05:19 +02:00