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
..
boxes	Update mymodulewidget1.php	2021-12-04 15:23:21 +01:00
modules	Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop	2021-12-30 19:03:46 +01:00
tpl	Look and feel v15	2021-10-18 21:20:58 +02:00
triggers	Clean dead code	2021-05-17 08:58:02 +02:00