Merge branch '3.2'

This commit is contained in:
Robbie Averill 2018-07-04 09:31:39 +12:00
commit b676d96c5d

View File

@ -25,7 +25,7 @@
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.7", "phpunit/phpunit": "^5.7",
"squizlabs/php_codesniffer": "^3.0", "squizlabs/php_codesniffer": "^3.0",
"silverstripe/versioned": "^1@dev" "silverstripe/versioned": "^1"
}, },
"extra": { "extra": {
"screenshots": [ "screenshots": [