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

Merge remote-tracking branch 'origin/1.1' into 1

This commit is contained in:
Damian Mooyman 2018-02-07 18:28:24 +13:00
parent b4066e017a c2b64c0855
commit 60891b866e
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
composer.json
View File

@ -6,16 +6,16 @@
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"require": { "require": {
"silverstripe/recipe-plugin": "^1", "silverstripe/recipe-plugin": "^1",
"silverstripe/recipe-core": "1.1.x-dev", "silverstripe/recipe-core": "1.2.x-dev",
"silverstripe/admin": "1.1.x-dev", "silverstripe/admin": "1.2.x-dev",
"silverstripe/asset-admin": "1.1.x-dev", "silverstripe/asset-admin": "1.2.x-dev",
"silverstripe/campaign-admin": "1.1.x-dev", "silverstripe/campaign-admin": "1.2.x-dev",
"silverstripe/cms": "4.1.x-dev", "silverstripe/cms": "4.2.x-dev",
"silverstripe/errorpage": "1.1.x-dev", "silverstripe/errorpage": "1.2.x-dev",
"silverstripe/graphql": "1.1.x-dev", "silverstripe/graphql": "1.2.x-dev",
"silverstripe/reports": "4.1.x-dev", "silverstripe/reports": "4.2.x-dev",
"silverstripe/siteconfig": "4.1.x-dev", "silverstripe/siteconfig": "4.2.x-dev",
"silverstripe/versioned": "1.1.x-dev" "silverstripe/versioned": "1.2.x-dev"
}, },
"require-dev": { "require-dev": {
"phpunit/PHPUnit": "^5.7" "phpunit/PHPUnit": "^5.7"
@ -25,8 +25,7 @@
"mysite/code/*" "mysite/code/*"
], ],
"branch-alias": { "branch-alias": {
"1.x-dev": "1.1.x-dev", "1.x-dev": "1.2.x-dev"
"dev-master": "2.x-dev"
} }
}, },
"config": { "config": {