Laurent Destailleur 5ea47f3ade Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/compta/resultat/index.php
	htdocs/product/admin/product.php
	htdocs/projet/tasks/list.php

2020-07-08 18:11:58 +02:00

..

index.php

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

2020-07-08 18:11:58 +02:00