Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell
2015-02-22 19:50:13 -06:00
7 changed files with 299 additions and 5 deletions

View File

@@ -15,7 +15,7 @@ return [
|
*/
'driver' => 'smtp',
'driver' => env('MAIL_DRIVER', 'smtp'),
/*
|--------------------------------------------------------------------------
@@ -28,7 +28,7 @@ return [
|
*/
'host' => 'smtp.mailgun.org',
'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
/*
|--------------------------------------------------------------------------
@@ -41,7 +41,7 @@ return [
|
*/
'port' => 587,
'port' => env('MAIL_PORT', 587),
/*
|--------------------------------------------------------------------------
@@ -80,7 +80,7 @@ return [
|
*/
'username' => null,
'username' => env('MAIL_USERNAME'),
/*
|--------------------------------------------------------------------------
@@ -93,7 +93,7 @@ return [
|
*/
'password' => null,
'password' => env('MAIL_PASSWORD'),
/*
|--------------------------------------------------------------------------