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/4.2' into 4

This commit is contained in:
Damian Mooyman 2018-06-15 16:09:59 +12:00
parent b4ae2e084f d24e50c52e
commit 05e0589a36
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
composer.json
View File

@ -6,16 +6,16 @@
"license": "BSD-3-Clause",
"require": {
"silverstripe/recipe-plugin": "^1.2",
"silverstripe/recipe-core": "4.2.x-dev",
"silverstripe/admin": "1.2.x-dev",
"silverstripe/asset-admin": "1.2.x-dev",
"silverstripe/campaign-admin": "1.2.x-dev",
"silverstripe/cms": "4.2.x-dev",
"silverstripe/errorpage": "1.2.x-dev",
"silverstripe/graphql": "2.0.x-dev",
"silverstripe/reports": "4.2.x-dev",
"silverstripe/siteconfig": "4.2.x-dev",
"silverstripe/versioned": "1.2.x-dev"
"silverstripe/recipe-core": "4.3.x-dev",
"silverstripe/admin": "1.3.x-dev",
"silverstripe/asset-admin": "1.3.x-dev",
"silverstripe/campaign-admin": "1.3.x-dev",
"silverstripe/cms": "4.3.x-dev",
"silverstripe/errorpage": "1.3.x-dev",
"silverstripe/graphql": "2.1.x-dev",
"silverstripe/reports": "4.3.x-dev",
"silverstripe/siteconfig": "4.3.x-dev",
"silverstripe/versioned": "1.3.x-dev"
},
"require-dev": {
"phpunit/PHPUnit": "^5.7"
@ -25,7 +25,7 @@
"app/src/*"
],
"branch-alias": {
"4.x-dev": "4.2.x-dev"
"4.x-dev": "4.3.x-dev"
}
},
"config": {