Skip to content

Commit

Permalink
Merge branch '2.0' into 2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
robbieaverill committed Dec 1, 2017
2 parents eeca59f + 45092df commit 99ee72e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down

0 comments on commit 99ee72e

Please sign in to comment.