Merge branch 'v0.31.x'

diff --combined composer.json
index df2439f85415ba9113929226e913e46a004663d6,68d33499bba0ea97926c293ced4e3ba91fb04d81..e6a833291db2db75a38b47a5cc0b2149fd33a78a
--- 1/composer.json
--- 2/composer.json
+++ b/composer.json
@@@ -18,7 -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",
@@@ -31,7 -31,7 +31,7 @@@
          "socialiteproviders/okta": "^4.1",
          "socialiteproviders/slack": "^4.1",
          "socialiteproviders/twitch": "^5.3",
 -        "ssddanbrown/htmldiff": "^1.0"
 +        "ssddanbrown/htmldiff": "^v1.0.1"
      },
      "require-dev": {
          "barryvdh/laravel-debugbar": "^3.5.1",