Merge branch 'main' into develop

This commit is contained in:
James Cole 2021-10-09 08:47:07 +02:00
commit 339ac7c996
No known key found for this signature in database
GPG Key ID: BDE6667570EADBD5

12
composer.lock generated
View File

@ -7839,16 +7839,16 @@
}, },
{ {
"name": "composer/composer", "name": "composer/composer",
"version": "2.1.8", "version": "2.1.9",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/composer.git", "url": "https://github.com/composer/composer.git",
"reference": "24d38e9686092de05214cafa187dc282a5d89497" "reference": "e558c88f28d102d497adec4852802c0dc14c7077"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/composer/zipball/24d38e9686092de05214cafa187dc282a5d89497", "url": "https://api.github.com/repos/composer/composer/zipball/e558c88f28d102d497adec4852802c0dc14c7077",
"reference": "24d38e9686092de05214cafa187dc282a5d89497", "reference": "e558c88f28d102d497adec4852802c0dc14c7077",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -7917,7 +7917,7 @@
"support": { "support": {
"irc": "ircs://irc.libera.chat:6697/composer", "irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/composer/issues", "issues": "https://github.com/composer/composer/issues",
"source": "https://github.com/composer/composer/tree/2.1.8" "source": "https://github.com/composer/composer/tree/2.1.9"
}, },
"funding": [ "funding": [
{ {
@ -7933,7 +7933,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2021-09-15T11:55:15+00:00" "time": "2021-10-05T07:47:38+00:00"
}, },
{ {
"name": "composer/metadata-minifier", "name": "composer/metadata-minifier",