Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2014-06-01 13:15:50 -05:00
parent a6a01b976c 5a7d9a0c25
commit 3ea3cc6287
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/config/mail.php
View File

@ -35,9 +35,9 @@
| SMTP Host Port | SMTP Host Port
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This is the SMTP port used by your application to delivery e-mails to | This is the SMTP port used by your application to deliver e-mails to
| users of your application. Like the host we have set this value to | users of the application. Like the host we have set this value to
| stay compatible with the Mailgun e-mail applications by default. | stay compatible with the Mailgun e-mail application by default.
| |
*/ */

2
app/config/queue.php Normal file → Executable file
View File

@ -11,7 +11,7 @@
| API, giving you convenient access to each back-end using the same | API, giving you convenient access to each back-end using the same
| syntax for each one. Here you may set the default queue driver. | syntax for each one. Here you may set the default queue driver.
| |
| Supported: "sync", "beanstalkd", "sqs", "iron" | Supported: "sync", "beanstalkd", "sqs", "iron", "redis"
| |
*/ */

3
app/views/emails/auth/reminder.blade.php
View File

@ -7,7 +7,8 @@
<h2>Password Reset</h2> <h2>Password Reset</h2>
<div> <div>
To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}. To reset your password, complete this form: {{ URL::to('password/reset', array($token)) }}.<br/>
This link will expire in {{ Config::get('auth.reminder.expire', 60) }} minutes.
</div> </div>
</body> </body>
</html> </html>