Merge branch '4.0' into 4

2018-10-16 17:33:09 +02:00 · 2018-10-16 17:33:09 +02:00 · 94dca0e56a
parent 5146e6fac0 a7c076fee0
commit 94dca0e56a
1 changed files with 1 additions and 5 deletions
--- a/composer.json
+++ b/composer.json
@ -42,11 +42,7 @@
            "SilverStripe\\BehatExtension\\Tests\\": "tests/php/"
        }
    },
-    "extra": {
-        "branch-alias": {
-            "3.x-dev": "3.1.x-dev"
-        }
-    },
+    "extra": [],
    "bin": [
        "bin/behat-ss"
    ],