Merge branch '2.2'

This commit is contained in:
Robbie Averill 2019-08-15 10:13:35 +12:00
commit b3acde80f6

View File

@ -18,7 +18,7 @@
"silverstripe/framework": "^4" "silverstripe/framework": "^4"
}, },
"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" "silverstripe/versioned": "^1"
}, },