From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 13 Aug 2021 01:26:44 +0000 (+1000)
Subject: Merge in 5.41
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8aad2dca45fd75c58f9fd64c2352609a133dceb3;p=civicrm-core.git

Merge in 5.41
---

8aad2dca45fd75c58f9fd64c2352609a133dceb3
diff --cc composer.lock
index 2648ad73f3,cbeb21f09a..9c00d15a18
--- 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": "127a1f748210d2bbea50645b5c0b2663",
 -    "content-hash": "aceccd69415b5fd67668ed7c0c870c39",
++    "content-hash": "96460a970b8f56a147890c6704c01d60",
      "packages": [
          {
              "name": "adrienrn/php-mimetyper",