tonyair/silverstripe-spamprotection
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-spamprotection.git synced 2024-10-22 14:05:59 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '1.1' into 2.0

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
composer.json
View File

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