Merge branch '2.0' into 2.1

GuySartorelli · Sep 28, 2023 · bd9266d · bd9266d
2 parents 6dbfad7 + 68184c4
commit bd9266d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -47,6 +47,9 @@
     "dnadesign/silverstripe-elemental": "^5",
     "silverstripe/recipe-testing": "^3"
   },
+  "conflict": {
+    "silverstripe/framework": ">=5.1.0"
+  },
   "extra": {
     "expose": [
       "client/dist",