Merge branch '4.1' into 4.2

symbiote · May 27, 2018 · 0e28ce5 · 0e28ce5
2 parents e720995 + 40cc765
commit 0e28ce5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 34 deletions.
diff --git a/changelog.md b/changelog.md
diff --git a/composer.json b/composer.json
@@ -25,11 +25,7 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
-    "extra": {
-        "branch-alias": {
-            "dev-master": "4.x-dev"
-        }
-    },
+    "extra": [],
     "replace": {
         "silverstripe/queuedjobs": "self.version"
     },