tonyair
/
silverstripe-dms
mirror of https://github.com/silverstripe/silverstripe-dms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '2.1'

This commit is contained in:
Robbie Averill 2017-12-01 14:57:57 +13:00
parent 14b615f1e4 99ee72e17f
commit 1bceff58dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
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": {
@ -19,7 +19,7 @@
},
"extra": {
"branch-alias": {
"dev-master": "2.1.x-dev"
"dev-master": "2.2.x-dev"
}
}
}