Skip to content

S
syncEnrollments
Commit 4cefc88f authored by Graham Campbell's avatar Graham Campbell
Browse files
Options

Merge branch 'master' into develop

parents 1aefbc9a f2348b78
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 9 deletions
config/auth.php
View file @ 4cefc88f
...@@ -59,8 +59,8 @@ return [ ...@@ -59,8 +59,8 @@ return [
*/ */
'password' => [ 'password' => [
'email' => 'emails.password', 'email' => 'emails.password',
'table' => 'password_resets', 'table' => 'password_resets',
'expire' => 60, 'expire' => 60,
], ],
......
config/queue.php
View file @ 4cefc88f
...@@ -37,8 +37,8 @@ return [ ...@@ -37,8 +37,8 @@ return [
'database' => [ 'database' => [
'driver' => 'database', 'driver' => 'database',
'table' => 'jobs', 'table' => 'jobs',
'queue' => 'default', 'queue' => 'default',
'expire' => 60, 'expire' => 60,
], ],
...@@ -67,10 +67,10 @@ return [ ...@@ -67,10 +67,10 @@ return [
], ],
'redis' => [ 'redis' => [
'driver' => 'redis', 'driver' => 'redis',
'connection' => 'default', 'connection' => 'default',
'queue' => 'default', 'queue' => 'default',
'expire' => 60, 'expire' => 60,
], ],
], ],
...@@ -87,8 +87,8 @@ return [ ...@@ -87,8 +87,8 @@ return [
*/ */
'failed' => [ 'failed' => [
'database' => env('DB_CONNECTION', 'mysql'), 'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs', '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