Merge branch 'master' into develop

Conflicts:
	config/mail.php
This commit is contained in:
Graham Campbell 2015-10-30 18:17:48 +00:00
commit 1aefbc9a54
1 changed files with 2 additions and 1 deletions

View File

@ -87,7 +87,8 @@
*/ */
'failed' => [ 'failed' => [
'database' => 'mysql', 'table' => 'failed_jobs', 'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs',
], ],
]; ];