Merge branch 'master' into develop

2016-12-29 13:03:32 +00:00
parent 077d404c5f b43890c11f
commit 36875bb98e
8 changed files with 35 additions and 19 deletions
--- a/config/mail.php
+++ b/config/mail.php
@@ -56,8 +56,8 @@ return [
    */

    'from' => [
-        'address' => 'hello@example.com',
-        'name' => 'Example',
+        'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
+        'name' => env('MAIL_FROM_NAME', 'Example'),
    ],

    /*