Merge branch '1.1' into 2.0

This commit is contained in:
Daniel Hensby 2017-01-31 12:09:41 +00:00
commit 3b4f757d6e
No known key found for this signature in database
GPG Key ID: B00D1E9767F0B06E
2 changed files with 15 additions and 17 deletions

View File

@ -2,26 +2,24 @@
"name": "silverstripe/spamprotection",
"description": "Spam protection module for SilverStripe.",
"type": "silverstripe-module",
"keywords": [
"silverstripe",
"spamprotection"
],
"authors": [
{
"name": "Saophalkun Ponlu",
"email": "phalkunz@silverstripe.com"
},
{
"name": "Will Rossiter",
"email": "will@fullscreen.io"
}
],
"keywords": ["silverstripe", "spamprotection"],
"authors": [{
"name": "Saophalkun Ponlu",
"email": "phalkunz@silverstripe.com"
}, {
"name": "Will Rossiter",
"email": "will@fullscreen.io"
}],
"require": {
"silverstripe/framework": "~3.1"
},
"require-dev": {
"phpunit/PHPUnit": "~3.7@stable"
},
"extra": [],
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
}
},
"license": "BSD-3-Clause"
}