Commit 6502d5ac authored by xjm's avatar xjm
Browse files

Merge 8.9.17, resolve merge conflicts, and update lockfile and dev versions.

parents 802b06b1 43554ed1
......@@ -667,7 +667,7 @@
"dist": {
"type": "path",
"url": "core",
"reference": "d434926f87508a8b2fa14757b11768ae5deffdf7"
"reference": "36edce9e1b31ec80c7e9d8edfc1aa569f9a968b9"
},
"require": {
"asm89/stack-cors": "^1.1",
......@@ -693,7 +693,7 @@
"laminas/laminas-diactoros": "^1.8",
"laminas/laminas-feed": "^2.12",
"masterminds/html5": "^2.1",
"pear/archive_tar": "^1.4.12",
"pear/archive_tar": "^1.4.14",
"php": "^7.0.8",
"psr/log": "^1.0",
"stack/builder": "^1.0",
......@@ -1681,16 +1681,16 @@
},
{
"name": "pear/archive_tar",
"version": "1.4.13",
"version": "1.4.14",
"source": {
"type": "git",
"url": "https://github.com/pear/Archive_Tar.git",
"reference": "2b87b41178cc6d4ad3cba678a46a1cae49786011"
"reference": "4d761c5334c790e45ef3245f0864b8955c562caa"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/pear/Archive_Tar/zipball/2b87b41178cc6d4ad3cba678a46a1cae49786011",
"reference": "2b87b41178cc6d4ad3cba678a46a1cae49786011",
"url": "https://api.github.com/repos/pear/Archive_Tar/zipball/4d761c5334c790e45ef3245f0864b8955c562caa",
"reference": "4d761c5334c790e45ef3245f0864b8955c562caa",
"shasum": ""
},
"require": {
......@@ -1757,7 +1757,7 @@
"type": "patreon"
}
],
"time": "2021-02-16T10:50:50+00:00"
"time": "2021-07-20T13:53:39+00:00"
},
{
"name": "pear/console_getopt",
......@@ -7000,5 +7000,5 @@
"prefer-lowest": false,
"platform": [],
"platform-dev": [],
"plugin-api-version": "2.0.0"
"plugin-api-version": "2.1.0"
}
......@@ -28,7 +28,7 @@
"laminas/laminas-zendframework-bridge": "1.0.4",
"masterminds/html5": "2.3.0",
"paragonie/random_compat": "v9.99.99",
"pear/archive_tar": "1.4.13",
"pear/archive_tar": "1.4.14",
"pear/console_getopt": "v1.4.3",
"pear/pear-core-minimal": "v1.10.10",
"pear/pear_exception": "v1.0.1",
......
......@@ -46,7 +46,7 @@
"laminas/laminas-diactoros": "^1.8",
"composer/semver": "^1.0",
"asm89/stack-cors": "^1.1",
"pear/archive_tar": "^1.4.12",
"pear/archive_tar": "^1.4.14",
"psr/log": "^1.0"
},
"conflict": {
......
......@@ -82,7 +82,7 @@ class Drupal {
/**
* The current system version.
*/
const VERSION = '8.9.17-dev';
const VERSION = '8.9.18-dev';
/**
* Core API compatibility.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment