Laurent Destailleur 2a18bce2f3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 ...

Conflicts:
	htdocs/api/index.php
	htdocs/langs/en_US/productbatch.lang
	htdocs/langs/fr_FR/productbatch.lang
	htdocs/ticket/list.php

2022-02-16 20:31:55 +01:00

..

index.php

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

2022-02-16 20:31:55 +01:00