Merge branch '4.5' into 4

This commit is contained in:
Daniel Hensby 2018-07-16 11:16:01 +01:00
commit 9f7bbe0e27
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9

View File

@ -30,9 +30,9 @@
}
],
"require": {
"silverstripe/framework": "~3.2",
"silverstripe/cms": "~3.2",
"symbiote/silverstripe-gridfieldextensions": "~2.0",
"silverstripe/framework": "^3.4.2",
"silverstripe/cms": "^3.4.2",
"symbiote/silverstripe-gridfieldextensions": "^2.0",
"silverstripe/segment-field": "^1.0"
},
"suggest": {