Laurent Destailleur 65533360a2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 ...

Conflicts:
	htdocs/main.inc.php

2024-02-12 03:32:58 +01:00

..

doc

…

mod_barcode_product_standard.php

Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0

2024-02-12 03:32:58 +01:00

mod_barcode_thirdparty_standard.php

…

modules_barcode.class.php

…