Laurent Destailleur e0ed89c514 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/admin/productaccount.php htdocs/compta/facture/card.php htdocs/contrat/class/contrat.class.php htdocs/core/actions_addupdatedelete.inc.php htdocs/product/class/product.class.php htdocs/product/price.php htdocs/projet/tasks/time.php		2020-11-01 17:58:41 +01:00
..
stats	replace deprecated	2020-10-22 22:50:03 +02:00
comment.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
contact.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
document.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
list.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
note.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
task.php	end of dol_fiche_end	2020-10-27 18:19:31 +01:00
time.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-11-01 17:58:41 +01:00