Merge branch '4.0' into 4

silverstripe · Aug 31, 2022 · dce7e55 · dce7e55
2 parents 3cb830d + a41be65
commit dce7e55
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/composer.json b/composer.json
@@ -21,6 +21,11 @@
         "dnadesign/silverstripe-elemental": "^4.9",
         "silverstripe/frameworktest": "^0.4.4"
     },
+    "conflict": {
+        "dnadesign/silverstripe-elemental": "<4.6.0",
+        "silverstripe/admin": "<1.8.0",
+        "silverstripe/asset-admin": "<1.8.0"
+    },
     "autoload": {
         "psr-4": {
             "SilverStripe\\GraphQL\\": "src/",