Merge remote-tracking branch 'origin/1.0' into 1
# Conflicts: # composer.json
This commit is contained in:
commit
c67d507737
|
@ -12,7 +12,7 @@
|
||||||
"silverstripe/campaign-admin": "1.1.x-dev",
|
"silverstripe/campaign-admin": "1.1.x-dev",
|
||||||
"silverstripe/cms": "4.1.x-dev",
|
"silverstripe/cms": "4.1.x-dev",
|
||||||
"silverstripe/errorpage": "1.1.x-dev",
|
"silverstripe/errorpage": "1.1.x-dev",
|
||||||
"silverstripe/graphql": "0.2.x-dev",
|
"silverstripe/graphql": "1.1.x-dev",
|
||||||
"silverstripe/reports": "4.1.x-dev",
|
"silverstripe/reports": "4.1.x-dev",
|
||||||
"silverstripe/siteconfig": "4.1.x-dev",
|
"silverstripe/siteconfig": "4.1.x-dev",
|
||||||
"silverstripe/versioned": "1.1.x-dev"
|
"silverstripe/versioned": "1.1.x-dev"
|
||||||
|
@ -34,4 +34,4 @@
|
||||||
},
|
},
|
||||||
"prefer-stable": true,
|
"prefer-stable": true,
|
||||||
"minimum-stability": "dev"
|
"minimum-stability": "dev"
|
||||||
}
|
}
|
Loading…
Reference in New Issue