Skip to content

Commit

Permalink
Merge branch 'b-7.3.x' into b-8.0.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG-7.3.md
#	composer.json
  • Loading branch information
AshrafOxid committed Nov 21, 2024
2 parents 5d22818 + b4e9348 commit f7489c8
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@
"oxid-esales/oxideshop-unified-namespace-generator": "dev-b-8.0.x",
"phpmailer/phpmailer": "^6.5.0",
"psr/container": "^1.1.1",
"symfony/config": "^6.3",
"symfony/console": "^6.3",
"symfony/dependency-injection": "^6.3",
"symfony/dotenv": "^6.3",
"symfony/event-dispatcher": "^6.3",
"symfony/expression-language": "^6.3",
"symfony/filesystem": "^6.3",
"symfony/finder": "^6.3",
"symfony/lock": "^6.3",
"symfony/mime": "^6.3",
"symfony/string": "^6.3",
"symfony/yaml": "^6.3"
"symfony/config": "^6.4",
"symfony/console": "^6.4",
"symfony/dependency-injection": "^6.4",
"symfony/dotenv": "^6.4",
"symfony/event-dispatcher": "^6.4",
"symfony/expression-language": "^6.4",
"symfony/filesystem": "^6.4",
"symfony/finder": "^6.4",
"symfony/lock": "^6.4",
"symfony/mime": "^6.4",
"symfony/string": "^6.4",
"symfony/yaml": "^6.4"
},
"require-dev": {
"codeception/codeception": "^5.0",
Expand All @@ -57,8 +57,8 @@
"phpspec/prophecy-phpunit": "^2.0.1",
"phpunit/phpunit": "^11.4",
"squizlabs/php_codesniffer": "^3.5.4",
"symfony/browser-kit": "^6.3",
"symfony/http-client": "^6.3"
"symfony/browser-kit": "^6.4",
"symfony/http-client": "^6.4"
},
"minimum-stability": "dev",
"prefer-stable": true,
Expand Down

0 comments on commit f7489c8

Please sign in to comment.