Merge branch 'v0.31.x' into release

2021-02-02 20:57:41 +00:00 · 2021-02-02 20:57:41 +00:00 · cb8117e8df
parent 5a218d5056 d547ed4a6b
commit cb8117e8df
2 changed files with 208 additions and 193 deletions
--- a/composer.json
+++ b/composer.json
@ -18,7 +18,7 @@
        "facade/ignition": "^1.16.4",
        "fideloper/proxy": "^4.4.1",
        "intervention/image": "^2.5.1",
-        "laravel/framework": "^6.20.12",
+        "laravel/framework": "^6.20.16",
        "laravel/socialite": "^5.1",
        "league/commonmark": "^1.5",
        "league/flysystem-aws-s3-v3": "^1.0.29",
--- a/composer.lock
+++ b/composer.lock