Merge remote-tracking branch 'origin/4.0' into 4

2017-10-12 11:54:38 +13:00 · 2017-10-12 11:54:38 +13:00 · 8d36d55205
parent 315a387a87 0c52623ad0
commit 8d36d55205
2 changed files with 4 additions and 1 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -17,6 +17,9 @@ trim_trailing_whitespace = false
 indent_size = 2
 indent_style = space

+[composer.json]
+indent_size = 4
+
 # Don't perform any clean-up on thirdparty files

 [thirdparty/**]
--- a/composer.json
+++ b/composer.json
@ -52,7 +52,7 @@
    },
    "require-dev": {
        "phpunit/phpunit": "^5.7",
-        "silverstripe/versioned": "^1.0@dev",
+        "silverstripe/versioned": "^1@dev",
        "silverstripe/behat-extension": "^3",
        "silverstripe/serve": "dev-master",
        "se/selenium-server-standalone": "2.41.0"