From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 18 Mar 2020 23:53:07 +0000 (+1100)
Subject: Merge in 5.24
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e2261dcb3aa0ba7e093ed3ae4fc767ed9c931cb8;p=civicrm-core.git

Merge in 5.24
---

e2261dcb3aa0ba7e093ed3ae4fc767ed9c931cb8
diff --cc composer.lock
index 45e250c848,a699277482..b6daf4ece7
--- a/composer.lock
+++ b/composer.lock
@@@ -4,44 -4,8 +4,44 @@@
          "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
          "This file is @generated automatically"
      ],
-     "content-hash": "790ef555de5c4f1ce33035b02aadcbcc",
 -    "content-hash": "50e07f942de796516f50da3b20ce018b",
++    "content-hash": "3d22226af501e1f685b799acc269da69",
      "packages": [
 +        {
 +            "name": "adrienrn/php-mimetyper",
 +            "version": "0.2.2",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/adrienrn/php-mimetyper.git",
 +                "reference": "702e00a604b4baed34d69730ce055e05c0f43932"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/adrienrn/php-mimetyper/zipball/702e00a604b4baed34d69730ce055e05c0f43932",
 +                "reference": "702e00a604b4baed34d69730ce055e05c0f43932",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "dflydev/apache-mime-types": "^1.0"
 +            },
 +            "type": "library",
 +            "autoload": {
 +                "psr-4": {
 +                    "MimeTyper\\": "src/"
 +                }
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Hussard",
 +                    "email": "adrien.ricartnoblet@gmail.com"
 +                }
 +            ],
 +            "description": "PHP mime type and extension mapping library: compatible with Symfony, powered by jshttp/mime-db",
 +            "time": "2018-09-27T09:45:05+00:00"
 +        },
          {
              "name": "cache/integration-tests",
              "version": "0.16.0",
@@@ -145,7 -109,7 +145,7 @@@
                  {
                      "name": "Tobias Nyholm",
                      "email": "tobias.nyholm@gmail.com",
--                    "homepage": "https://github.com/Nyholm"
++                    "homepage": "https://github.com/nyholm"
                  },
                  {
                      "name": "Nicolas Grekas",