Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell
2013-10-22 22:05:25 -05:00
2 changed files with 4 additions and 4 deletions

View File

@@ -13,7 +13,7 @@ return array(
| |
*/ */
"password" => "Passwords must be six characters and match the confirmation.", "password" => "Passwords must be at least six characters long and match the confirmation.",
"user" => "We can't find a user with that e-mail address.", "user" => "We can't find a user with that e-mail address.",