Commit 4cefc88f authored by Graham Campbell's avatar Graham Campbell

Merge branch 'master' into develop

parents 1aefbc9a f2348b78
......@@ -59,8 +59,8 @@ return [
*/
'password' => [
'email' => 'emails.password',
'table' => 'password_resets',
'email' => 'emails.password',
'table' => 'password_resets',
'expire' => 60,
],
......
......@@ -37,8 +37,8 @@ return [
'database' => [
'driver' => 'database',
'table' => 'jobs',
'queue' => 'default',
'table' => 'jobs',
'queue' => 'default',
'expire' => 60,
],
......@@ -67,10 +67,10 @@ return [
],
'redis' => [
'driver' => 'redis',
'driver' => 'redis',
'connection' => 'default',
'queue' => 'default',
'expire' => 60,
'queue' => 'default',
'expire' => 60,
],
],
......@@ -87,8 +87,8 @@ return [
*/
'failed' => [
'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs',
'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs',
],
];
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment