From: Dan Brown <redacted>
Date: Tue, 27 Sep 2022 18:34:48 +0000 (+0100)
Subject: Merge branch 'auth_review' into development
X-Git-Tag: v22.10~1^2~23
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/bf562540770a2889d2dacc02248572911eeb5fa5

Merge branch 'auth_review' into development
---

bf562540770a2889d2dacc02248572911eeb5fa5
diff --cc composer.lock
index 762fb0a36,cf7b8f72f..1804ef379
--- a/composer.lock
+++ b/composer.lock
@@@ -4,7 -4,7 +4,7 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
          "This file is @generated automatically"
      ],
-     "content-hash": "4a0d254197dda8118685ec1a1eb10edf",
 -    "content-hash": "01795571047babf7ee6372b7f98843af",
++    "content-hash": "1fed6278d440ef18af1ffa6ca7b29166",
      "packages": [
          {
              "name": "aws/aws-crt-php",
@@@ -58,16 -58,16 +58,16 @@@
          },
          {
              "name": "aws/aws-sdk-php",
-             "version": "3.236.0",
 -            "version": "3.235.1",
++            "version": "3.236.1",
              "source": {
                  "type": "git",
                  "url": "https://github.com/aws/aws-sdk-php.git",
-                 "reference": "bff1f1ade00c758ea27f498baee1fa16901e5bfd"
 -                "reference": "2025db05c7dd22ae414857dadd49207f64c2fc74"
++                "reference": "1e8d1abe7582968df16a2e7a87c5dcc51d0dfd1b"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/bff1f1ade00c758ea27f498baee1fa16901e5bfd",
-                 "reference": "bff1f1ade00c758ea27f498baee1fa16901e5bfd",
 -                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/2025db05c7dd22ae414857dadd49207f64c2fc74",
 -                "reference": "2025db05c7dd22ae414857dadd49207f64c2fc74",
++                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1e8d1abe7582968df16a2e7a87c5dcc51d0dfd1b",
++                "reference": "1e8d1abe7582968df16a2e7a87c5dcc51d0dfd1b",
                  "shasum": ""
              },
              "require": {
@@@ -146,9 -144,9 +146,9 @@@
              "support": {
                  "forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
                  "issues": "https://github.com/aws/aws-sdk-php/issues",
-                 "source": "https://github.com/aws/aws-sdk-php/tree/3.236.0"
 -                "source": "https://github.com/aws/aws-sdk-php/tree/3.235.1"
++                "source": "https://github.com/aws/aws-sdk-php/tree/3.236.1"
              },
-             "time": "2022-09-26T18:13:07+00:00"
 -            "time": "2022-09-02T18:18:19+00:00"
++            "time": "2022-09-27T18:19:10+00:00"
          },
          {
              "name": "bacon/bacon-qr-code",