Merge branch '2.0' into 2.1

This commit is contained in:
Robbie Averill 2017-12-01 14:55:41 +13:00
commit 99ee72e17f

View File

@ -11,7 +11,7 @@
"require": {
"silverstripe/framework": "^3.5",
"silverstripe/cms": "^3.5",
"symbiote/silverstripe-gridfieldextensions": "^1.1.0",
"symbiote/silverstripe-gridfieldextensions": "^2.0",
"silverstripe/taxonomy": "^1.2"
},
"suggest": {