Merge branch 'master' into develop
Conflicts: config/mail.php
This commit is contained in:
commit
1aefbc9a54
|
@ -87,7 +87,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
'failed' => [
|
'failed' => [
|
||||||
'database' => 'mysql', 'table' => 'failed_jobs',
|
'database' => env('DB_CONNECTION', 'mysql'),
|
||||||
|
'table' => 'failed_jobs',
|
||||||
],
|
],
|
||||||
|
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in New Issue