-
Notifications
You must be signed in to change notification settings - Fork 4
/
Copy pathv8.5.16...v8.5.17.diff
44 lines (40 loc) · 1.47 KB
/
v8.5.16...v8.5.17.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45e94be1..b5a89ee9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
# Release Notes
-## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.16...8.x)
+## [Unreleased](https://github.com/laravel/laravel/compare/v8.5.17...8.x)
+
+
+## [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)
diff --git a/artisan b/artisan
index 5c23e2e2..67a3329b 100755
--- a/artisan
+++ b/artisan
@@ -11,7 +11,7 @@ define('LARAVEL_START', microtime(true));
| Composer provides a convenient, automatically generated class loader
| 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
-| loading of any our classes "manually". Feels great to relax.
+| loading of any of our classes manually. It's great to relax.
|
*/
diff --git a/composer.json b/composer.json
index cd7641be..d0635f15 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
"fideloper/proxy": "^4.4",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
- "laravel/framework": "^8.12",
+ "laravel/framework": "^8.40",
"laravel/tinker": "^2.5"
},
"require-dev": {