Merge branch '2.3'

2016-12-14 13:31:07 +00:00 · 2016-12-14 13:31:07 +00:00 · 176014afaa
parent b51e545e4b 203f931961
commit 176014afaa
1 changed files with 37 additions and 32 deletions
--- a/composer.json
+++ b/composer.json
@ -2,7 +2,12 @@
    "name": "silverstripe/fulltextsearch",
    "description": "Adds support for Fulltext Search engines like Sphinx and Solr to SilverStripe CMS",
    "type": "silverstripe-module",
-	"keywords": ["silverstripe", "sphinx", "solr", "fulltext"],
+    "keywords": [
+        "silverstripe",
+        "sphinx",
+        "solr",
+        "fulltext"
+    ],
    "authors": [
        {
            "name": "Hamish Friedlander",
@ -24,7 +29,7 @@
    },
    "extra": {
        "branch-alias": {
-			"dev-master": "2.3.x-dev"
+            "dev-master": "2.x-dev"
        }
    },
    "suggest": {