From ddb56be86f50709be4a312fa1de25f65b2053116 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 4 Feb 2016 17:43:50 +1300
Subject: [PATCH] Alias master as 1.2.x-dev

---
 changelog.md  | 1 +
 composer.json | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/changelog.md b/changelog.md
index 7428498..05f771c 100644
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [1.2.2]
 
+- Alias master as 1.2.x-dev
 - Added standard Scrutinizer config	
 - Converted to PSR-2
 - Added standard editor config
diff --git a/composer.json b/composer.json
index 200ca1c..8ac3806 100644
--- a/composer.json
+++ b/composer.json
@@ -20,5 +20,10 @@
 	},
 	"require": {
 		"silverstripe/framework": "~3.1"
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "1.2.x-dev"
+		}
 	}
 }