Skip to content

Commit

Permalink
Merge branch '2.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
lchrusciel committed Dec 22, 2024
2 parents e1aca9c + f1282fb commit ea783a2
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 @@ -23,13 +23,13 @@
"sylius/core-bundle": "^1.12",
"sylius/api-bundle": "^1.12",
"sylius/resource-bundle": "^1.10",
"symfony/config": "5.4.* || ^6.0",
"symfony/dependency-injection": "5.4.* || ^6.0",
"symfony/form": "5.4.* || ^6.0",
"symfony/http-foundation": "5.4.* || ^6.0",
"symfony/http-kernel": "5.4.* || ^6.0",
"symfony/routing": "5.4.* || ^6.0",
"symfony/uid": "5.4.* || ^6.0",
"symfony/config": "5.4.* || 6.4.*",
"symfony/dependency-injection": "5.4.* || 6.4.*",
"symfony/form": "5.4.* || 6.4.*",
"symfony/http-foundation": "5.4.* || 6.4.*",
"symfony/http-kernel": "5.4.* || 6.4.*",
"symfony/routing": "5.4.* || 6.4.*",
"symfony/uid": "5.4.* || 6.4.*",
"tpay-com/tpay-openapi-php": "^1.8"
},
"conflict": {
Expand All @@ -53,15 +53,15 @@
"sylius-labs/coding-standard": "^4.2",
"sylius/refund-plugin": "^1.5",
"sylius/sylius": "^1.12",
"symfony/browser-kit": "^5.4 || ^6.0",
"symfony/debug-bundle": "^5.4 || ^6.0",
"symfony/dotenv": "^5.4 || ^6.0",
"symfony/browser-kit": "^5.4 || 6.4.*",
"symfony/debug-bundle": "^5.4 || 6.4.*",
"symfony/dotenv": "^5.4 || 6.4.*",
"symfony/flex": "^2.4",
"symfony/intl": "^5.4 || ^6.0",
"symfony/intl": "^5.4 || 6.4.*",
"symfony/monolog-bundle": "^3.10",
"symfony/panther": "^2.1",
"symfony/runtime": "5.4.* || ^6.0",
"symfony/web-profiler-bundle": "^5.4 || ^6.0",
"symfony/runtime": "5.4.* || 6.4.*",
"symfony/web-profiler-bundle": "^5.4 || 6.4.*",
"theofidry/alice-data-fixtures": "^1.6"
},
"config": {
Expand All @@ -78,7 +78,7 @@
"dev-main": "2.1-dev"
},
"symfony": {
"require": "5.4.*"
"require": "6.4.*"
}
},
"scripts": {
Expand Down

0 comments on commit ea783a2

Please sign in to comment.