Merge branch 'develop' into feature/vuejs

2018-05-31 22:59:16 -07:00 · 2018-05-31 22:59:16 -07:00 · 5f70502f20
commit 5f70502f20
parent 0b7dbd65ff 3078b61ac6
31 changed files with 835 additions and 7 deletions
--- a/resources/lang/en/strings.php
+++ b/resources/lang/en/strings.php
@ -74,6 +74,7 @@ return [
    'tasks' => 'Tasks',
    'seconds' => 'Seconds',
    'minutes' => 'Minutes',
+    'under_maintenance' => 'Under Maintenance',
    'days' => [
        'sun' => 'Sunday',
        'mon' => 'Monday',