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

Conflicts:
	htdocs/mrp/lib/mrp_mo.lib.php
This commit is contained in:
Laurent Destailleur 2021-10-06 18:41:51 +02:00
commit e228f07877

View File

@ -106,7 +106,5 @@ function moPrepareHead($object)
complete_head_from_modules($conf, $langs, $object, $head, $h, 'mo@mrp', 'remove');
complete_head_from_modules($conf, $langs, $object, $head, $h, 'mo@mrp', 'remove');
return $head;
}