Merge branch '2.6' into 2

2024-10-22 11:05:32 +02:00 · 2021-05-21 14:28:25 +12:00 · 2021-05-21 14:28:25 +12:00 · 4200a95b95
commit 4200a95b95
parent 5e0174a560 a677c63694
1 changed files with 1 additions and 4 deletions
--- a/composer.json
+++ b/composer.json
@ -33,13 +33,10 @@
        }
    },
    "extra": {
-        "branch-alias": {
-            "dev-master": "2.x-dev"
-        },
        "expose": [
            "client/dist"
        ]
    },
    "minimum-stability": "dev",
    "prefer-stable": true
-}
+}