Merge branch 'master' into develop

This commit is contained in:
Dane Everitt 2019-08-04 13:49:26 -07:00
commit 81143e231a
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
41 changed files with 303 additions and 190 deletions

View file

@ -16,6 +16,7 @@ return [
'connection' => 'Connection',
'memory' => 'Memory',
'cpu' => 'CPU',
'disk' => 'Disk',
'status' => 'Status',
'search' => 'Search',
'suspended' => 'Suspended',