Laurent Destailleur 91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/prelevement/class/bonprelevement.class.php htdocs/compta/prelevement/create.php htdocs/compta/prelevement/fiche-stat.php		2020-07-27 19:35:34 +02:00
..
multicurrency.class.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-07-27 19:35:34 +02:00