lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.6' into 3.7

Browse Source 
Conflicts:
	htdocs/main.inc.php
This commit is contained in:
Laurent Destailleur 2015-04-28 21:14:17 +02:00
commit b0071a7c6c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/main.inc.php
View File

@ -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)) if (! empty($conf->global->MAIN_BUGTRACK_ENABLELINK))
{ {
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';