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

2017-10-12 12:58:30 +13:00 · 2017-10-12 12:58:30 +13:00 · 8020e36409
parent 4a80bd9166 c5ca89a173
commit 8020e36409
2 changed files with 5 additions and 2 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -14,5 +14,8 @@ trim_trailing_whitespace = true
 indent_size = 2
 indent_style = space

+[composer.json]
+indent_size = 4
+
 # The indent size used in the package.json file cannot be changed:
 # https://github.com/npm/npm/pull/3180#issuecomment-16336516
--- a/composer.json
+++ b/composer.json
@ -32,11 +32,11 @@
    },
    "extra": {
        "branch-alias": {
-            "4.x-dev": "4.0.x-dev",
+            "4.x-dev": "4.1.x-dev",
            "dev-master": "5.x-dev"
        },
        "expose": [
-          "javascript"
+            "javascript"
        ]
    },
    "autoload": {