Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell
2013-09-06 23:51:46 -05:00
4 changed files with 16 additions and 2 deletions

View File

@@ -52,11 +52,19 @@ return array(
| that should be used as your password reminder e-mail. You will also
| be able to set the name of the table that holds the reset tokens.
|
| The "expire" time is the number of minutes that the reminder should be
| considered valid. This security feature keeps tokens short-lived so
| they have less time to be guessed. You may change this as needed.
|
*/
'reminder' => array(
'email' => 'emails.auth.reminder', 'table' => 'password_reminders',
'email' => 'emails.auth.reminder',
'table' => 'password_reminders',
'expire' => 60,
),

View File

@@ -24,7 +24,7 @@ return array(
|--------------------------------------------------------------------------
|
| Here you may specify the number of minutes that you wish the session
| to be allowed to remain idle for it is expired. If you want them
| to be allowed to remain idle before it expires. If you want them
| to immediately expire when the browser closes, set it to zero.
|
*/