Merge pull request #3304 from sineld/develop

support for unencrypted mail server usage like mailcatcher.me

Merge pull request #3304 from sineld/develop
support for unencrypted mail server usage like mailcatcher.me
ce5bcb2f · Taylor Otwell · 8909e755 · fad5c6ee · ce5bcb2f · ce5bcb2f
Commit ce5bcb2f authored Mar 04, 2015 by Taylor Otwell
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

.env.example .env.example +1 -0

mail.php config/mail.php +1 -1

No files found.
--- 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
\ No newline at end of file
--- a/config/mail.php
+++ b/config/mail.php
@@ -67,7 +67,7 @@ return [
    |
    */

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

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