ivo/ponzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '8.x'

Browse Source 
# Conflicts:
#	CHANGELOG.md
This commit is contained in:
Dries Vints
2020-11-10 15:58:52 +01:00
parent 1aa50f0e4c 3d7a5075e7
commit e4517a8951
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -1,6 +1,12 @@
# Release Notes # 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) ## [v8.4.0 (2020-10-30)](https://github.com/laravel/laravel/compare/v8.3.0...v8.4.0)

1
resources/lang/en/auth.php
View File

@@ -14,6 +14,7 @@ return [
*/ */
'failed' => 'These credentials do not match our records.', '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.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
]; ];