Laurent Destailleur 3ac268c200 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 ... Conflicts: htdocs/core/lib/security.lib.php htdocs/holiday/card.php htdocs/user/card.php		2022-04-11 21:14:51 +02:00
..
index.php	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0	2022-04-11 21:14:51 +02:00