Merge branch '4'

This commit is contained in:
Daniel Hensby 2018-07-23 17:49:40 +01:00
commit 189b53fea0
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9

View File

@ -9,7 +9,7 @@
"silverstripe-themes/simple": "~3.2.0" "silverstripe-themes/simple": "~3.2.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^7@dev" "phpunit/phpunit": "^7"
}, },
"autoload": { "autoload": {
"classmap": [ "classmap": [