Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
f4da26ce
Commit
f4da26ce
authored
Jul 20, 2021
by
Jess
Browse files
Merge 9.2.2, resolve merge conflicts, and update lockfile and dev versions.
parents
e32aa6ad
1ceb17f7
Changes
4
Hide whitespace changes
Inline
Side-by-side
composer.lock
View file @
f4da26ce
...
...
@@ -534,7 +534,7 @@
"dist": {
"type": "path",
"url": "core",
"reference": "
538af067d3843f8b7394e98991fcec7c2d45213d
"
"reference": "
107b1d4f65408eb2844facd227005517de15343b
"
},
"require": {
"asm89/stack-cors": "^1.1",
...
...
@@ -559,7 +559,7 @@
"laminas/laminas-diactoros": "^2.1",
"laminas/laminas-feed": "^2.12",
"masterminds/html5": "^2.1",
"pear/archive_tar": "^1.4.1
2
",
"pear/archive_tar": "^1.4.1
4
",
"php": ">=7.3.0",
"psr/log": "^1.0",
"stack/builder": "^1.0",
...
...
@@ -1553,16 +1553,16 @@
},
{
"name": "pear/archive_tar",
"version": "1.4.1
3
",
"version": "1.4.1
4
",
"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": {
...
...
@@ -1629,7 +1629,7 @@
"type": "patreon"
}
],
"time": "2021-0
2-16
T1
0
:5
0:50
+00:00"
"time": "2021-0
7-20
T1
3
:5
3:39
+00:00"
},
{
"name": "pear/console_getopt",
...
...
@@ -8016,5 +8016,5 @@
"platform-overrides": {
"php": "7.3.0"
},
"plugin-api-version": "2.
0
.0"
"plugin-api-version": "2.
1
.0"
}
composer/Metapackage/CoreRecommended/composer.json
View file @
f4da26ce
...
...
@@ -23,7 +23,7 @@
"laminas/laminas-stdlib"
:
"3.3.1"
,
"laminas/laminas-zendframework-bridge"
:
"1.2.0"
,
"masterminds/html5"
:
"2.7.4"
,
"pear/archive_tar"
:
"1.4.1
3
"
,
"pear/archive_tar"
:
"1.4.1
4
"
,
"pear/console_getopt"
:
"v1.4.3"
,
"pear/pear-core-minimal"
:
"v1.10.10"
,
"pear/pear_exception"
:
"v1.0.2"
,
...
...
core/composer.json
View file @
f4da26ce
...
...
@@ -45,7 +45,7 @@
"laminas/laminas-diactoros"
:
"^2.1"
,
"composer/semver"
:
"^3.0"
,
"asm89/stack-cors"
:
"^1.1"
,
"pear/archive_tar"
:
"^1.4.1
2
"
,
"pear/archive_tar"
:
"^1.4.1
4
"
,
"psr/log"
:
"^1.0"
},
"conflict"
:
{
...
...
core/lib/Drupal.php
View file @
f4da26ce
...
...
@@ -75,7 +75,7 @@ class Drupal {
/**
* The current system version.
*/
const
VERSION
=
'9.2.
2
-dev'
;
const
VERSION
=
'9.2.
3
-dev'
;
/**
* Core API compatibility.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment