Merge branch '2.3'

This commit is contained in:
Daniel Hensby 2016-12-14 13:31:07 +00:00
commit 176014afaa
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E

View File

@ -1,35 +1,40 @@
{ {
"name": "silverstripe/fulltextsearch", "name": "silverstripe/fulltextsearch",
"description": "Adds support for Fulltext Search engines like Sphinx and Solr to SilverStripe CMS", "description": "Adds support for Fulltext Search engines like Sphinx and Solr to SilverStripe CMS",
"type": "silverstripe-module", "type": "silverstripe-module",
"keywords": ["silverstripe", "sphinx", "solr", "fulltext"], "keywords": [
"authors": [ "silverstripe",
{ "sphinx",
"name": "Hamish Friedlander", "solr",
"email": "hamish@silverstripe.com" "fulltext"
}, ],
{ "authors": [
"name": "Damian Mooyman", {
"email": "damian@silverstripe.com", "name": "Hamish Friedlander",
"email": "hamish@silverstripe.com"
},
{
"name": "Damian Mooyman",
"email": "damian@silverstripe.com",
"role": "Developer" "role": "Developer"
} }
], ],
"require": { "require": {
"silverstripe/framework": "~3.1", "silverstripe/framework": "~3.1",
"monolog/monolog": "~1.15" "monolog/monolog": "~1.15"
}, },
"require-dev": { "require-dev": {
"silverstripe/cms": "~3.1", "silverstripe/cms": "~3.1",
"hafriedlander/silverstripe-phockito": "*" "hafriedlander/silverstripe-phockito": "*"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.3.x-dev" "dev-master": "2.x-dev"
} }
}, },
"suggest": { "suggest": {
"silverstripe/fulltextsearch-localsolr": "Adds a ready-to-use local Solr server for initial development" "silverstripe/fulltextsearch-localsolr": "Adds a ready-to-use local Solr server for initial development"
}, },
"minimum-stability": "dev", "minimum-stability": "dev",
"license": "BSD-3-Clause" "license": "BSD-3-Clause"
} }