Skip to content

Commit 00925f4

Browse files
committed
# Conflicts: # CHANGELOG.md # composer.json # composer.lock # src/config/app.php
2 parents c17c822 + ee0815f commit 00925f4

3 files changed

Lines changed: 67 additions & 67 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Unreleased
44

5+
- Fixed an issue that prevented Craft from being installed. ([#18700](https://github.com/craftcms/cms/issues/18700))
56
- Fixed a bug where nested element cards weren’t showing validation errors. ([#18690](https://github.com/craftcms/cms/pull/18690))
67
- Fixed a bug where read-only Matrix fields in Index mode weren’t respecting the Default Table Columns setting. ([#18684](https://github.com/craftcms/cms/issues/18684))
78
- Fixed a bug where nested entries could be lost when reverting content from a revision. ([#18691](https://github.com/craftcms/cms/issues/18691))

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"monolog/monolog": "^3.0",
5252
"phpdocumentor/reflection-docblock": "^5.3",
5353
"phpoffice/phpspreadsheet": "^5.3",
54+
"pixelandtonic/graphql-php": "~14.11.10.1",
5455
"pixelandtonic/imagine": "~1.3.3.1",
5556
"pragmarx/google2fa": "^8.0",
5657
"pragmarx/recovery": "^0.2.1",
@@ -69,7 +70,6 @@
6970
"twig/twig": "~3.21.1",
7071
"voku/portable-ascii": "^2.0",
7172
"web-auth/webauthn-lib": "~5.2.4",
72-
"webonyx/graphql-php": "~14.11.10",
7373
"yiisoft/yii2": "~2.0.54.0",
7474
"yiisoft/yii2-debug": "~2.1.27.0",
7575
"yiisoft/yii2-queue": "~2.3.2",

composer.lock

Lines changed: 65 additions & 66 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)