Skip to content

Commit

Permalink
Merge pull request #227 from PrestaShop/develop
Browse files Browse the repository at this point in the history
Merge `develop` into `master`
  • Loading branch information
Progi1984 authored Jun 13, 2024
2 parents dfb8a06 + 135c93e commit f0333ac
Show file tree
Hide file tree
Showing 15 changed files with 1,088 additions and 307 deletions.
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
"doctrine/doctrine-migrations-bundle": "^3.3",
"doctrine/orm": "^3.1",
"symfony/apache-pack": "^1.0",
"symfony/console": "~7.0.0",
"symfony/dotenv": "~7.0.0",
"symfony/console": "~7.1.0",
"symfony/dotenv": "~7.1.0",
"symfony/flex": "^2",
"symfony/framework-bundle": "~7.0.0",
"symfony/runtime": "~7.0.0",
"symfony/yaml": "~7.0.0"
"symfony/framework-bundle": "~7.1.0",
"symfony/runtime": "~7.1.0",
"symfony/yaml": "~7.1.0"
},
"require-dev": {
"ergebnis/composer-normalize": "^2.41",
"friendsofphp/php-cs-fixer": "^3.45",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^11.0",
"symfony/browser-kit": "~7.0.0",
"symfony/css-selector": "~7.0.0",
"symfony/browser-kit": "~7.1.0",
"symfony/css-selector": "~7.1.0",
"symfony/maker-bundle": "^1.52",
"symfony/phpunit-bridge": "^7.0"
},
Expand Down
Loading

0 comments on commit f0333ac

Please sign in to comment.