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
doc/Support/Configuration.md
View File

@@ -215,6 +215,8 @@ Arrays of subnets to exclude in auto discovery mode.
#### Email configuration
> You can configure these options within the WebUI now, please avoid setting these options within config.php
```php
$config['email_backend'] = 'mail';
$config['email_from'] = NULL;