mirror of
https://github.com/silverstripe/recipe-cms.git
synced 2024-10-22 08:05:52 +02:00
Merge remote-tracking branch 'origin/4.2' into 4
This commit is contained in:
commit
05e0589a36
@ -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": {
|
||||
|
Loading…
Reference in New Issue
Block a user