Laurent Destailleur 79c68c6132 Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0 ...

Conflicts:
	htdocs/commande/stats/index.php

2021-01-28 00:23:44 +01:00

..

index.php

Merge branch '12.0' of https://github.com/dolibarr/dolibarr into 13.0

2021-01-28 00:23:44 +01:00