Laurent Destailleur d3de81fecb Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 ... Conflicts: htdocs/holiday/card.php htdocs/holiday/class/holiday.class.php		2021-08-22 19:34:13 +02:00
..
holiday.class.php	Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0	2021-08-22 19:34:13 +02:00