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

Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/modules/modCommande.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/modPropale.class.php
	htdocs/filefunc.inc.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php

2021-12-30 19:03:46 +01:00

..

about.php

Debug v14

2021-04-29 10:01:10 +02:00

myobject_extrafields.php

Debug v14

2021-04-29 10:01:10 +02:00

setup.php

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

2021-12-30 19:03:46 +01:00