Merge branch '4.7' into 4

This commit is contained in:
Steve Boyd 2020-11-12 15:12:41 +13:00
commit 9936e8fd3f

View File

@ -14,10 +14,10 @@
"silverstripe/versioned-admin": "1.x-dev", "silverstripe/versioned-admin": "1.x-dev",
"silverstripe/cms": "4.x-dev", "silverstripe/cms": "4.x-dev",
"silverstripe/errorpage": "1.x-dev", "silverstripe/errorpage": "1.x-dev",
"silverstripe/graphql": "3.x-dev",
"silverstripe/reports": "4.x-dev", "silverstripe/reports": "4.x-dev",
"silverstripe/siteconfig": "4.x-dev", "silverstripe/siteconfig": "4.x-dev",
"silverstripe/versioned": "1.x-dev" "silverstripe/versioned": "1.x-dev",
"silverstripe/graphql": "3.x-dev"
}, },
"require-dev": { "require-dev": {
"sminnee/phpunit": "^5.7", "sminnee/phpunit": "^5.7",