Merge branch 'develop' into feature/vue-serverview

2018-09-05 21:34:59 -07:00 · 2018-09-05 21:34:59 -07:00 · 5ca13839cf
commit 5ca13839cf
parent 5c4d5f733f c305320cc6
110 changed files with 7190 additions and 2093 deletions
--- a/resources/lang/en/command/messages.php
+++ b/resources/lang/en/command/messages.php
@ -49,7 +49,7 @@ return [
    ],
    'environment' => [
        'mail' => [
-            'ask_smtp_host' => 'SMTP Host (e.g. smtp.google.com)',
+            'ask_smtp_host' => 'SMTP Host (e.g. smtp.gmail.com)',
            'ask_smtp_port' => 'SMTP Port',
            'ask_smtp_username' => 'SMTP Username',
            'ask_smtp_password' => 'SMTP Password',