mirror of
https://github.com/silverstripe/recipe-cms.git
synced 2024-09-28 18:49:01 +02:00
Merge remote-tracking branch 'origin/1'
# Conflicts: # composer.json
This commit is contained in:
commit
e1b1ae9698
@ -12,7 +12,7 @@
|
|||||||
"silverstripe/campaign-admin": "2.x-dev",
|
"silverstripe/campaign-admin": "2.x-dev",
|
||||||
"silverstripe/cms": "5.x-dev",
|
"silverstripe/cms": "5.x-dev",
|
||||||
"silverstripe/errorpage": "2.x-dev",
|
"silverstripe/errorpage": "2.x-dev",
|
||||||
"silverstripe/graphql": "2.x-dev",
|
"silverstripe/graphql": "3.x-dev",
|
||||||
"silverstripe/reports": "5.x-dev",
|
"silverstripe/reports": "5.x-dev",
|
||||||
"silverstripe/siteconfig": "5.x-dev",
|
"silverstripe/siteconfig": "5.x-dev",
|
||||||
"silverstripe/versioned": "2.x-dev"
|
"silverstripe/versioned": "2.x-dev"
|
||||||
|
Loading…
Reference in New Issue
Block a user