8000 fix merge · symfony/symfony@fcb3309 · GitHub
[go: up one dir, main page]

Skip to content

Commit fcb3309

Browse files
fix merge
1 parent ed0b361 commit fcb3309

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"symfony/doctrine-bridge": "self.version",
4949
"symfony/dom-crawler": "self.version",
5050
"symfony/dotenv": "self.version",
51+
"symfony/error-handler": "self.version",
5152
"symfony/error-renderer": "self.version",
5253
"symfony/event-dispatcher": "self.version",
5354
"symfony/expression-language": "self.version",

src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
"symfony/form": "^4.3|^5.0",
4242
"symfony/expression-language": "^3.4|^4.0|^5.0",
4343
"symfony/http-client": "^4.3|^5.0",
44+
"symfony/lock": "^4.4|^5.0",
4445
"symfony/mailer": "^4.3|^5.0",
4546
"symfony/messenger": "^4.3|^5.0",
4647
"symfony/mime": "^4.3|^5.0",
@@ -57,7 +58,6 @@
5758
"symfony/workflow": "^4.3|^5.0",
5859
"symfony/yaml": "^3.4|^4.0|^5.0",
5960
"symfony/property-info": "^3.4|^4.0|^5.0",
60-
"symfony/lock": "^4.4|^5.0",
6161
"symfony/web-link": "^3.4|^4.0|^5.0",
6262
"doctrine/annotations": "~1.0",
6363
"phpdocumentor/reflection-docblock": "^3.0|^4.0",

0 commit comments

Comments
 (0)
0