Merge branch '6.0' into 6

# Conflicts: # composer.json
silverstripe · Jan 8, 2025 · e558711 · e558711
2 parents 1f3fbf0 + 9450dbb
commit e558711
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "require": {
         "php": "^8.3",
         "silverstripe/recipe-plugin": "2.x-dev",
-        "silverstripe/vendor-plugin": "2.x-dev",
+        "silverstripe/vendor-plugin": "3.x-dev",
         "silverstripe/recipe-cms": "6.x-dev",
         "silverstripe-themes/simple": "3.x-dev",
         "silverstripe/login-forms": "6.x-dev"