Laurent Destailleur f6f4968af6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 ... Conflicts: htdocs/societe/consumption.php		2021-05-06 16:52:36 +02:00
..
doliwamp	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0	2021-05-06 16:52:36 +02:00