Merge branch 'master' into develop

This commit is contained in:
Graham Campbell 2015-10-30 18:20:17 +00:00
commit 4cefc88f4b
2 changed files with 9 additions and 9 deletions

View File

@ -59,8 +59,8 @@
*/
'password' => [
'email' => 'emails.password',
'table' => 'password_resets',
'email' => 'emails.password',
'table' => 'password_resets',
'expire' => 60,
],

View File

@ -37,8 +37,8 @@
'database' => [
'driver' => 'database',
'table' => 'jobs',
'queue' => 'default',
'table' => 'jobs',
'queue' => 'default',
'expire' => 60,
],
@ -67,10 +67,10 @@
],
'redis' => [
'driver' => 'redis',
'driver' => 'redis',
'connection' => 'default',
'queue' => 'default',
'expire' => 60,
'queue' => 'default',
'expire' => 60,
],
],
@ -87,8 +87,8 @@
*/
'failed' => [
'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs',
'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs',
],
];