Merge branch '3.0' into 3.1

2018-03-15 11:04:25 +13:00 · 2018-03-15 11:04:25 +13:00 · ba5a932c10
parent 990c996c97 c0087fe2fc
commit ba5a932c10
1 changed files with 1 additions and 5 deletions
--- a/composer.json
+++ b/composer.json
@ -38,11 +38,7 @@
            "SilverStripe\\FullTextSearch\\Tests\\": "tests/"
        }
    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.x-dev"
-        }
-    },
+    "extra": [],
    "suggest": {
        "silverstripe/fulltextsearch-localsolr": "Adds a ready-to-use local Solr server for initial development"
    },