Merge branch 'master' into storageareas

This commit is contained in:
Isaac Connor committed 2019-02-10 12:37:45 -05:00
commit 555cb4780d
75 files changed
+251 -160

No files matched your search

@@ -3035,7 +3035,7 @@ our @options = (
},
{
name => 'ZM_WEB_H_REFRESH_NAVBAR',
default => '5',
default => '60',
description => 'How often (in seconds) the navigation header should refresh itself',
help => q`
The navigation header contains the general status information about server load and storage space.
@@ -3308,7 +3308,7 @@ our @options = (
},
{
name => 'ZM_WEB_M_REFRESH_NAVBAR',
default => '15',
default => '120',
description => 'How often (in seconds) the navigation header should refresh itself',
help => q`
The navigation header contains the general status information about server load and storage space.
@@ -3581,7 +3581,7 @@ our @options = (
},
{
name => 'ZM_WEB_L_REFRESH_NAVBAR',
default => '35',
default => '180',
description => 'How often (in seconds) the navigation header should refresh itself',
help => q`
The navigation header contains the general status information about server load and storage space.