Merge remote-tracking branch 'origin/1.0' into 1

# Conflicts: # composer.json
2017-10-12 14:40:04 +13:00 · 2017-10-12 14:40:04 +13:00 · c67d507737
parent f97a8f5c9c b69371c244
commit c67d507737
1 changed files with 2 additions and 2 deletions
--- a/composer.json
+++ b/composer.json
@ -12,7 +12,7 @@
        "silverstripe/campaign-admin": "1.1.x-dev",
        "silverstripe/cms": "4.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/siteconfig": "4.1.x-dev",
        "silverstripe/versioned": "1.1.x-dev"
@ -34,4 +34,4 @@
    },
    "prefer-stable": true,
    "minimum-stability": "dev"
-}
+}