tonyair/recipe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/recipe-cms.git synced 2024-10-22 08:05:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1'

Browse Source 
# Conflicts:
#	composer.json
This commit is contained in:
Damian Mooyman 2018-03-21 12:53:38 +13:00
commit e1b1ae9698
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -12,7 +12,7 @@
"silverstripe/campaign-admin": "2.x-dev",
"silverstripe/cms": "5.x-dev",
"silverstripe/errorpage": "2.x-dev",
"silverstripe/graphql": "2.x-dev",
"silverstripe/graphql": "3.x-dev",
"silverstripe/reports": "5.x-dev",
"silverstripe/siteconfig": "5.x-dev",
"silverstripe/versioned": "2.x-dev"