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
..
doc	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-11-01 17:58:41 +01:00
index.html
mod_commande_marbre.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-06-01 04:09:52 +02:00
mod_commande_saphir.php	Scrutinizer Auto-Fixes	2020-10-31 13:32:18 +00:00
modules_commande.php	Scrutinizer Auto-Fixes	2020-04-10 08:59:32 +00:00