Merge branch 'develop' into feature/vuejs

This commit is contained in:
Dane Everitt 2018-05-31 22:59:16 -07:00
commit 5f70502f20
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
31 changed files with 835 additions and 7 deletions

View file

@ -21,6 +21,11 @@ return [
'header' => 'Server Suspended',
'desc' => 'This server has been suspended and cannot be accessed.',
],
'maintenance' => [
'header' => 'Node Under Maintenance',
'title' => 'Temporarily Unavailable',
'desc' => 'This node is under maintenance, therefore your server can temporarily not be accessed.',
],
],
'index' => [
'header' => 'Your Servers',

View file

@ -74,6 +74,7 @@ return [
'tasks' => 'Tasks',
'seconds' => 'Seconds',
'minutes' => 'Minutes',
'under_maintenance' => 'Under Maintenance',
'days' => [
'sun' => 'Sunday',
'mon' => 'Monday',