Skip to content

S
syncEnrollments
Commit 4b1322e9 authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 58bc5273 892ab27f
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
app/User.php
View file @ 4b1322e9
...@@ -10,7 +10,8 @@ use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract; ...@@ -10,7 +10,8 @@ use Illuminate\Contracts\Auth\Authenticatable as AuthenticatableContract;
use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract; use Illuminate\Contracts\Auth\Access\Authorizable as AuthorizableContract;
use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract; use Illuminate\Contracts\Auth\CanResetPassword as CanResetPasswordContract;
class User extends Model implements AuthenticatableContract, class User extends Model implements
AuthenticatableContract,
AuthorizableContract, AuthorizableContract,
CanResetPasswordContract CanResetPasswordContract
{ {
......
config/database.php
View file @ 4b1322e9
...@@ -116,9 +116,9 @@ return [ ...@@ -116,9 +116,9 @@ return [
'cluster' => false, 'cluster' => false,
'default' => [ 'default' => [
'host' => '127.0.0.1', 'host' => env('REDIS_HOST', '127.0.0.1'),
'port' => 6379, 'port' => env('REDIS_PORT', 6379),
'database' => 0, 'database' => env('REDIS_DB', 0),
], ],
], ],
......
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