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.0' into 1

Browse Source 
# Conflicts:
#	composer.json
This commit is contained in:
Damian Mooyman 2017-10-12 14:40:04 +13:00
commit c67d507737
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
composer.json
View File

@ -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"
} }