Laurent Destailleur 11b6259130 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/holiday/class/holiday.class.php htdocs/langs/en_US/admin.lang		2021-09-10 11:40:45 +02:00
..
holiday.class.php	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-09-10 11:40:45 +02:00