Merged branch 'main' into nightly

ibexa · Mar 14, 2024 · 308fb75 · 308fb75
2 parents 130be63 + 6692ad3
commit 308fb75
Show file tree

Hide file tree

Showing 299 changed files with 1 addition and 30,671 deletions.
diff --git a/composer.json b/composer.json
@@ -60,7 +60,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "4.6.x-dev"
+            "dev-main": "5.0.x-dev"
         },
         "class": "Ibexa\\PostInstall\\PostInstall"
     }

diff --git a/resources/platformsh/common/4.6.0-beta1/.nvmrc b/resources/platformsh/common/4.6.0-beta1/.nvmrc
diff --git a/resources/platformsh/common/4.6.0-beta1/.platform/varnish.vcl b/resources/platformsh/common/4.6.0-beta1/.platform/varnish.vcl
diff --git a/resources/platformsh/common/4.6.0-beta2/.nvmrc b/resources/platformsh/common/4.6.0-beta2/.nvmrc
diff --git a/resources/platformsh/common/4.6.0-beta2/.platform/routes.yaml b/resources/platformsh/common/4.6.0-beta2/.platform/routes.yaml