Skip to content

Commit

Permalink
Merge branch 'refs/heads/1.4' into 1.x
Browse files Browse the repository at this point in the history
# Conflicts:
#	composer.json
  • Loading branch information
herbertroth committed Jul 2, 2024
2 parents 3ff827a + f80424f commit ab027f0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"php": "~8.1.0 || ~8.2.0 || ~8.3.0",
"cbschuld/browser.php": "^1.9.6",
"phpoffice/phpspreadsheet": "^1.24 || ^2.1",
"pimcore/pimcore": "^11.3.0",
"pimcore/pimcore": "~11.3.0",
"symfony/webpack-encore-bundle": "^1.13.2"
},
"require-dev": {
Expand Down

0 comments on commit ab027f0

Please sign in to comment.