Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts: htdocs/main.inc.php
This commit is contained in:
commit
b0071a7c6c
@ -1690,7 +1690,7 @@ function left_menu($menu_array_before, $helppagename='', $moresearchform='', $me
|
||||
}
|
||||
}
|
||||
|
||||
// Link to bugtrack
|
||||
// Link to bugtrack
|
||||
if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
|
||||
{
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user