From 2cad57d442f679ba05c0c318103d8088441f9235 Mon Sep 17 00:00:00 2001
From: scott1702 <scott@silverstripe.com>
Date: Thu, 19 Nov 2015 15:13:41 +1300
Subject: [PATCH] update changelog for release

---
 changelog.md  | 3 +++
 composer.json | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/changelog.md b/changelog.md
index 69d8bbb..bcf209a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,4 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [1.2.0]
 
 * Changelog added.
+* Added Scrutinizer support
 * Add `ContentFilter.cache_lifetime` config to set the cache lifetime.
+* Update alternate xml link tag to be W3 compliant 
+* Added CWP keyword
\ No newline at end of file
diff --git a/composer.json b/composer.json
index c7beec1..17dabc7 100644
--- a/composer.json
+++ b/composer.json
@@ -14,5 +14,12 @@
 	{
 		"silverstripe/framework": ">=3.1",
 		"silverstripe/cms": ">=3.1"
+	},
+	"extra": 
+	{
+		"branch-alias": 
+		{
+			"dev-master": "1.2.x-dev"
+		}
 	}
 }