Merge branch '3.2' into 3

2021-05-21 14:30:19 +12:00 · 2021-05-21 14:30:19 +12:00 · 90d4812aa8
parent 6af13768d3 d1bdc003ad
commit 90d4812aa8
1 changed files with 2 additions and 6 deletions
--- 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
-}
+}