Merge pull request #29 from scott1702/master

update changelog for release
2015-11-19 15:23:12 +13:00 · 2015-11-19 15:23:12 +13:00 · 84530d6678
parent 50661260c9 2cad57d442
commit 84530d6678
2 changed files with 10 additions and 0 deletions
--- 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
--- 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"
+		}
 	}
 }