Laurent Destailleur 47b3b30aaa Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php htdocs/fourn/product/list.php htdocs/product/fournisseurs.php htdocs/societe/card.php		2020-11-10 11:10:35 +01:00
..
list.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-11-10 11:10:35 +01:00