Laurent Destailleur 8410f4a9c9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 ... Conflicts: htdocs/admin/mails_templates.php htdocs/societe/consumption.php htdocs/user/class/user.class.php		2021-05-06 16:57:49 +02:00
..
doliwamp	Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0	2021-05-06 16:57:49 +02:00