Laurent Destailleur a2a15ceb5b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/prelevement/create.php htdocs/compta/prelevement/demandes.php htdocs/core/class/html.form.class.php		2020-05-27 23:07:18 +02:00
..
index.php	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-05-27 23:07:18 +02:00