Merge branch '3'

This commit is contained in:
Robbie Averill 2018-01-26 12:06:24 +13:00
commit 8e8c1db7bf

View File

@ -28,10 +28,6 @@
"silverstripe/versioned": "^1@dev"
},
"extra": {
"installer-name": "gridfieldextensions",
"branch-alias": {
"dev-master": "3.x-dev"
},
"screenshots": [
"docs/en/_images/editable-rows.png",
"docs/en/_images/add-existing-search.png"
@ -39,7 +35,10 @@
"expose": [
"css",
"javascript"
]
],
"branch-alias": {
"3.x-dev": "3.2.x-dev"
}
},
"replace": {
"ajshort/silverstripe-gridfieldextensions": "self.version",