From: Dan Brown <redacted>
Date: Wed, 28 Feb 2024 12:11:39 +0000 (+0000)
Subject: Merge branch 'v23-12' into development
X-Git-Tag: v24.02~1^2~4
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/c4279c9697d512556f8920f011a48f3af4b815a1

Merge branch 'v23-12' into development

Updated composer deps again to take lock file to current
---

c4279c9697d512556f8920f011a48f3af4b815a1
diff --cc composer.lock
index 99f496a11,c27012f5e..e1033b5b2
--- a/composer.lock
+++ b/composer.lock
@@@ -62,16 -62,16 +62,16 @@@
          },
          {
              "name": "aws/aws-sdk-php",
-             "version": "3.300.0",
 -            "version": "3.300.4",
++            "version": "3.300.6",
              "source": {
                  "type": "git",
                  "url": "https://github.com/aws/aws-sdk-php.git",
-                 "reference": "67a0c22a70bdcc99ca41028b78be3d5496481c14"
 -                "reference": "27d59c22c121ce9c0041c563dc9d7270e180925c"
++                "reference": "957ccef631684d612d01ced2fa3b0506f2ec78c3"
              },
              "dist": {
                  "type": "zip",
-                 "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/67a0c22a70bdcc99ca41028b78be3d5496481c14",
-                 "reference": "67a0c22a70bdcc99ca41028b78be3d5496481c14",
 -                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/27d59c22c121ce9c0041c563dc9d7270e180925c",
 -                "reference": "27d59c22c121ce9c0041c563dc9d7270e180925c",
++                "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/957ccef631684d612d01ced2fa3b0506f2ec78c3",
++                "reference": "957ccef631684d612d01ced2fa3b0506f2ec78c3",
                  "shasum": ""
              },
              "require": {
@@@ -151,9 -151,9 +151,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.300.0"
 -                "source": "https://github.com/aws/aws-sdk-php/tree/3.300.4"
++                "source": "https://github.com/aws/aws-sdk-php/tree/3.300.6"
              },
-             "time": "2024-02-19T19:08:33+00:00"
 -            "time": "2024-02-23T19:10:30+00:00"
++            "time": "2024-02-27T19:05:27+00:00"
          },
          {
              "name": "bacon/bacon-qr-code",
@@@ -8347,16 -8354,16 +8354,16 @@@
          },
          {
              "name": "larastan/larastan",
--            "version": "v2.9.0",
++            "version": "v2.9.1",
              "source": {
                  "type": "git",
                  "url": "https://github.com/larastan/larastan.git",
--                "reference": "35fa9cbe1895e76215bbe74571a344f2705fbe01"
++                "reference": "467113c58d110ad617cf9e07ff49b0948d1c03cc"
              },
              "dist": {
                  "type": "zip",
--                "url": "https://api.github.com/repos/larastan/larastan/zipball/35fa9cbe1895e76215bbe74571a344f2705fbe01",
--                "reference": "35fa9cbe1895e76215bbe74571a344f2705fbe01",
++                "url": "https://api.github.com/repos/larastan/larastan/zipball/467113c58d110ad617cf9e07ff49b0948d1c03cc",
++                "reference": "467113c58d110ad617cf9e07ff49b0948d1c03cc",
                  "shasum": ""
              },
              "require": {
@@@ -8424,7 -8431,7 +8431,7 @@@
              ],
              "support": {
                  "issues": "https://github.com/larastan/larastan/issues",
--                "source": "https://github.com/larastan/larastan/tree/v2.9.0"
++                "source": "https://github.com/larastan/larastan/tree/v2.9.1"
              },
              "funding": [
                  {
@@@ -8444,7 -8451,7 +8451,7 @@@
                      "type": "patreon"
                  }
              ],
--            "time": "2024-02-13T11:49:22+00:00"
++            "time": "2024-02-26T14:10:20+00:00"
          },
          {
              "name": "mockery/mockery",