Laurent Destailleur 6ad9eb8ef1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/product/class/api_products.class.php
	htdocs/recruitment/recruitmentcandidature_list.php
	htdocs/recruitment/recruitmentjobposition_list.php

2021-10-24 00:02:15 +02:00

..

holiday.class.php

Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop

2021-10-24 00:02:15 +02:00