Commit bf864b16 authored by Robbie Averill's avatar Robbie Averill

Merge branch '1.7'

parents 3817105c 43141a91
......@@ -8,10 +8,11 @@
"silverstripe/framework",
"silverstripe/siteconfig",
"silverstripe/reports",
"silverstripe-australia/gridfieldextensions"
"symbiote/silverstripe-gridfieldextensions"
],
"vendors": [
"cwp",
"silverstripe"
"silverstripe",
"symbiote"
]
}
.idea/
\ No newline at end of file
......@@ -6,23 +6,23 @@
"keywords": ["silverstripe", "cwp"],
"require": {
"php": ">=5.6",
"cwp/cwp": "1.6.x-dev",
"cwp/cwp-core": "1.6.x-dev",
"silverstripe/cms": "3.6.x-dev",
"silverstripe/framework": "3.6.x-dev",
"silverstripe/siteconfig": "3.6.x-dev",
"silverstripe/reports": "3.6.x-dev",
"silverstripe/advancedworkflow": "3.7.x-dev",
"cwp/cwp": "1.7.x-dev",
"cwp/cwp-core": "1.7.x-dev",
"silverstripe/cms": "~3.6.0",
"silverstripe/framework": "~3.6.0",
"silverstripe/siteconfig": "~3.6.0",
"silverstripe/reports": "~3.6.0",
"symbiote/silverstripe-advancedworkflow": "4.0.x-dev",
"silverstripe/contentreview": "3.0.x-dev",
"silverstripe/documentconverter": "1.0.x-dev",
"silverstripe/externallinks": "1.0.x-dev",
"silverstripe/fulltextsearch": "2.3.x-dev",
"silverstripe-australia/gridfieldextensions": "~1.4.2",
"symbiote/silverstripe-gridfieldextensions": "^2.0",
"silverstripe/html5": "1.0.x-dev",
"silverstripe/iframe": "1.0.x-dev",
"silverstripe/mimevalidator": "1.0.x-dev",
"silverstripe/multivaluefield": "2.3.x-dev",
"silverstripe/queuedjobs": "2.9.x-dev",
"symbiote/silverstripe-multivaluefield": "3.0.x-dev",
"symbiote/silverstripe-queuedjobs": "3.0.x-dev",
"silverstripe/registry": "1.0.x-dev",
"silverstripe/restfulserver": "1.0.x-dev",
"silverstripe/secureassets": "1.1.x-dev",
......@@ -33,10 +33,10 @@
"undefinedoffset/sortablegridfield": "~0.6.9",
"silverstripe/spellcheck": "1.0.x-dev",
"silverstripe/subsites": "1.3.x-dev",
"silverstripe/taxonomy": "1.1.x-dev",
"silverstripe/taxonomy": "1.2.x-dev",
"silverstripe/translatable": "2.2.x-dev",
"silverstripe/userforms": "4.3.x-dev",
"silverstripe/versionedfiles": "1.0.x-dev",
"silverstripe/userforms": "4.5.x-dev",
"symbiote/silverstripe-versionedfiles": "2.0.x-dev",
"silverstripe/versionfeed": "1.2.x-dev"
},
"extra": {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment