Merge branch '3.0' into 3.1

silverstripe · Mar 14, 2018 · ba5a932 · ba5a932
2 parents 990c996 + c0087fe
commit ba5a932
Showing 1 changed file with 1 addition and 5 deletions.
diff --git 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"
     },