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

Merge branch '8.x' 

# Conflicts:
#	CHANGELOG.md
#	composer.json
This commit is contained in:
Dries Vints 2021-05-11 22:50:27 +02:00
parent 4ce641d571 b1b28a6bb1
commit 72c6aaa8df
No known key found for this signature in database
GPG Key ID: E1529B3ACC4A5A76
2 changed files with 8 additions and 2 deletions
Show Stats 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.5.16...master) ## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.17...master)
## [v8.5.17 (2021-05-11)](https://github.com/laravel/laravel/compare/v8.5.16...v8.5.17)
### Security
- Bump framework version to include SQL server security fix ([#5601](https://github.com/laravel/laravel/pull/5601))
## [v8.5.16 (2021-04-20)](https://github.com/laravel/laravel/compare/v8.5.15...v8.5.16) ## [v8.5.16 (2021-04-20)](https://github.com/laravel/laravel/compare/v8.5.15...v8.5.16)

2
artisan
View File

@ -11,7 +11,7 @@ define('LARAVEL_START', microtime(true));
| Composer provides a convenient, automatically generated class loader | Composer provides a convenient, automatically generated class loader
| for our application. We just need to utilize it! We'll require it | for our application. We just need to utilize it! We'll require it
| into the script here so that we do not have to worry about the | into the script here so that we do not have to worry about the
| loading of any our classes "manually". Feels great to relax. | loading of any of our classes manually. It's great to relax.
| |
*/ */