From b4024c94bb1dd4d404c4aa2fd22e5f0cbedbc7eb Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Wed, 25 Nov 2015 11:48:01 +1300
Subject: [PATCH] Add changelog for 1.2.0

---
 CHANGELOG.md  | 4 ++++
 composer.json | 7 +------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb776377..ea29ba9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.2.0]
+
+* API Add option to specify http / https on subsite domains
+
 ## [1.1.0]
 
 * Changelog added.
diff --git a/composer.json b/composer.json
index 82e472bb..09d67b80 100644
--- a/composer.json
+++ b/composer.json
@@ -16,10 +16,5 @@
 	},
 	"require-dev": {
 		"phpunit/PHPUnit": "~3.7@stable"
-	},
-	"extra": {
-		"branch-alias": {
-			"dev-master": "1.1.x-dev"
-		}
-	}
+    }
 }