From 7a2344117edc781344d711914abe5ec94de2889e Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 11 Oct 2017 17:31:46 +1300
Subject: [PATCH 1/2] Remove obsolete branch-alias

---
 composer.json | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 7b19f6a4..c0287b85 100644
--- a/composer.json
+++ b/composer.json
@@ -31,12 +31,8 @@
         "phpunit/phpunit": "^5.7"
     },
     "extra": {
-        "branch-alias": {
-            "4.x-dev": "4.0.x-dev",
-            "dev-master": "5.x-dev"
-        },
         "expose": [
-          "javascript"
+            "javascript"
         ]
     },
     "autoload": {
@@ -51,4 +47,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}
\ No newline at end of file

From c5ca89a173d76d7927d5c03db4a51539616da141 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 12 Oct 2017 12:57:05 +1300
Subject: [PATCH 2/2] Update editorconfig

---
 .editorconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index 3dfb23c7..91e325d6 100644
--- 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