Merge branch '2.3' into 2.4

2016-07-29 11:45:45 -04:00
parent 0f029702d4 380048dd53
commit 915ea0d0bd
9 changed files with 72312 additions and 46 deletions
--- a/resources/lang/en/forms.php
+++ b/resources/lang/en/forms.php
@@ -23,6 +23,11 @@ return [
        'enable_google2fa' => 'Enable Google Two Factor Authentication',
        'cache_driver'     => 'Cache Driver',
        'session_driver'   => 'Session Driver',
+        'mail_driver'      => 'Mail Driver',
+        'mail_host'        => 'Mail Host',
+        'mail_address'     => 'Mail From Address',
+        'mail_username'    => 'Mail Username',
+        'mail_password'    => 'Mail Password',
    ],

    // Login form fields