Merge branch '2'

2017-11-28 13:20:31 +13:00 · 2017-11-28 13:20:31 +13:00 · 18694e0b69
parent 03a1311bef 2c277b53fb
commit 18694e0b69
2 changed files with 37 additions and 34 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -13,5 +13,8 @@ trim_trailing_whitespace = true
 [{*.yml,*.json}]
 indent_size = 2

+[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
@ -20,7 +20,7 @@
    },
    "extra": {
        "branch-alias": {
-      "dev-master": "2.0.x-dev"
+            "2.x-dev": "2.1.x-dev"
        }
    },
    "scripts": {