Merge remote-tracking branch 'upstream/7.x' into 8.x

# Conflicts: # src/Illuminate/Foundation/Application.php
laravel · Oct 8, 2020 · 0b9010d · 0b9010d
2 parents 0ce07ea + 5dfe9bc
commit 0b9010d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/CHANGELOG-6.x.md b/CHANGELOG-6.x.md
@@ -1,6 +1,12 @@
 # Release Notes for 6.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v6.18.41...6.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v6.18.42...6.x)
+
+
+## [v6.18.42 (2020-10-06)](https://github.com/laravel/framework/compare/v6.18.41...v6.18.42)
+
+### Fixed
+- Added missed RESET_THROTTLED constant to Password Facade ([#34641](https://github.com/laravel/framework/pull/34641))
 
 
 ## [v6.18.41 (2020-09-29)](https://github.com/laravel/framework/compare/v6.18.40...v6.18.41)

diff --git a/CHANGELOG-7.x.md b/CHANGELOG-7.x.md
@@ -1,6 +1,12 @@
 # Release Notes for 7.x
 
-## [Unreleased](https://github.com/laravel/framework/compare/v7.28.3...7.x)
+## [Unreleased](https://github.com/laravel/framework/compare/v7.28.4...7.x)
+
+
+## [v7.28.4 (2020-10-06)](https://github.com/laravel/framework/compare/v7.28.3...v7.28.4)
+
+### Fixed
+- Added missed RESET_THROTTLED constant to Password Facade ([#34641](https://github.com/laravel/framework/pull/34641))
 
 
 ## [v7.28.3 (2020-09-17)](https://github.com/laravel/framework/compare/v7.28.2...v7.28.3)