Merge branch '3.2' into 3

silverstripe · May 21, 2021 · 90d4812 · 90d4812
2 parents 6af1376 + d1bdc00
commit 90d4812
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -38,11 +38,7 @@
     "suggest": {
         "ext-fileinfo": "Improved support for file mime detection"
     },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.x-dev"
-        }
-    },
+    "extra": [],
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}