Merge remote-tracking branch 'origin/1.2' into 1.x

# Conflicts: # composer.json
pimcore · Nov 28, 2024 · a743b5f · a743b5f
2 parents 8863923 + 81488f3
commit a743b5f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
   "require": {
     "php": "~8.2.0 || ~8.3.0 ",
     "pimcore/pimcore": "^11.x-dev",
-    "pimcore/static-resolver-bundle": "^1.4.0",
+    "pimcore/static-resolver-bundle": "^1.4.0 || ^2.0",
     "pimcore/opensearch-client": "^1.x-dev",
     "pimcore/elasticsearch-client": "^1.x-dev",
     "doctrine/orm": "^2.17.2",