mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'issue-laf-110-new' of git://github.com/laf/librenms into laf-issue-laf-110-new

Browse Source 
Conflicts:
	html/pages/health/mempool.inc.php
	includes/defaults.inc.php
This commit is contained in:
f0o
2015-06-07 10:44:39 +00:00
parent d121fed936 451d0322c1
commit 2467b11290
26 changed files with 1469 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
includes/functions.php
View File

@@ -18,6 +18,7 @@ include_once("Net/IPv4.php");
include_once("Net/IPv6.php");
// Observium Includes
include_once($config['install_dir'] . "/includes/dbFacile.php");
include_once($config['install_dir'] . "/includes/common.php");
include_once($config['install_dir'] . "/includes/rrdtool.inc.php");
@@ -27,7 +28,6 @@ include_once($config['install_dir'] . "/includes/syslog.php");
include_once($config['install_dir'] . "/includes/rewrites.php");
include_once($config['install_dir'] . "/includes/snmp.inc.php");
include_once($config['install_dir'] . "/includes/services.inc.php");
include_once($config['install_dir'] . "/includes/dbFacile.php");
include_once($config['install_dir'] . "/includes/console_colour.php");
$console_color = new Console_Color2();