Merge branch '1.0-develop' into develop
This commit is contained in:
commit
18f6611a2d
60 changed files with 181 additions and 152 deletions
|
@ -138,10 +138,9 @@ class User extends Model implements
|
|||
'root_admin' => 'boolean',
|
||||
'use_totp' => 'boolean',
|
||||
'gravatar' => 'boolean',
|
||||
'totp_authenticated_at' => 'datetime',
|
||||
];
|
||||
|
||||
protected $dates = ['totp_authenticated_at'];
|
||||
|
||||
/**
|
||||
* The attributes excluded from the model's JSON form.
|
||||
*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue