Merge pull request #3304 from sineld/develop

support for unencrypted mail server usage like mailcatcher.me
2015-03-04 09:40:37 -06:00 · 2015-03-04 09:40:37 -06:00 · ce5bcb2f8f
parent 8909e75552 fad5c6ee9b
commit ce5bcb2f8f
2 changed files with 2 additions and 1 deletions
--- a/.env.example
+++ b/.env.example
@ -16,3 +16,4 @@ MAIL_HOST=mailtrap.io
 MAIL_PORT=2525
 MAIL_USERNAME=null
 MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
--- a/config/mail.php
+++ b/config/mail.php
@ -67,7 +67,7 @@
    |
    */

-    'encryption' => 'tls',
+    'encryption' => env('MAIL_ENCRYPTION', 'tls'),

    /*
    |--------------------------------------------------------------------------