Laurent Destailleur 7634212811 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/phpinfo.php htdocs/commande/stats/index.php htdocs/compta/facture/stats/index.php		2020-11-29 21:35:03 +01:00
..
index.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-11-29 21:35:03 +01:00