Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
This commit is contained in:
commit
cb1489e2fa
1 changed files with 3 additions and 0 deletions
|
|
@ -96,6 +96,9 @@ function marges_prepare_head()
|
|||
$head[$h][2] = 'checkMargins';
|
||||
}
|
||||
|
||||
complete_head_from_modules($conf,$langs,null,$head,$h,'margins','remove');
|
||||
complete_head_from_modules($conf,$langs,null,$head,$h,'margins');
|
||||
|
||||
return $head;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue