Merge branch '2.0'

This commit is contained in:
Robbie Averill 2018-04-06 10:45:42 +12:00
commit e33f65ecc0

View File

@ -14,7 +14,7 @@
"silverstripe/cms": "^4.0" "silverstripe/cms": "^4.0"
}, },
"require-dev": { "require-dev": {
"phpunit/PHPUnit": "^5.7", "phpunit/phpunit": "^5.7",
"squizlabs/php_codesniffer": "^3.0" "squizlabs/php_codesniffer": "^3.0"
}, },
"suggest": { "suggest": {