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:
commit
e228f07877
@ -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');
|
||||||
|
|
||||||
complete_head_from_modules($conf, $langs, $object, $head, $h, 'mo@mrp', 'remove');
|
|
||||||
|
|
||||||
return $head;
|
return $head;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user