Merge branch '8.x'

# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints 2020-11-10 15:58:52 +01:00
commit e4517a8951
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76
2 changed files with 8 additions and 1 deletions

View File

@ -1,6 +1,12 @@
# Release Notes
## [Unreleased](https://github.com/laravel/laravel/compare/v8.4.0...master)
## [Unreleased](https://github.com/laravel/laravel/compare/v8.4.1...master)
## [v8.4.1 (2020-11-10)](https://github.com/laravel/laravel/compare/v8.4.0...v8.4.1)
### Changed
- Add auth line ([b54ef29](https://github.com/laravel/laravel/commit/b54ef297b3c723c8438596c6e6afef93a7458b98))
## [v8.4.0 (2020-10-30)](https://github.com/laravel/laravel/compare/v8.3.0...v8.4.0)

View File

@ -14,6 +14,7 @@
*/
'failed' => 'These credentials do not match our records.',
'password' => 'The provided password is incorrect.',
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
];