From 13eba8d0204175bfe911694ed2d93fd8b1e17890 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian@silverstripe.com>
Date: Thu, 21 Aug 2014 15:30:48 +1200
Subject: [PATCH] Alias dev-master as 2.1

---
 composer.json | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index f75f0fd..c3a8385 100644
--- a/composer.json
+++ b/composer.json
@@ -5,28 +5,29 @@
 	"keywords": ["silverstripe", "cms", "i18n", "localization", "globalization"],
 	"license": "BSD-3-Clause",
 	"homepage": "https://github.com/silverstripe/silverstripe-translatable/",
-	"authors":[
+	"authors": [
 		{
 			"name": "Ingo Schommer",
 			"homepage": "http://chillu.com",
 			"email" : "ingo@silverstripe.com"
 		}
 	],
-	"require": 
-		{
-			"php": ">=5.3.2",
-			"silverstripe/framework": "~3.2",
-			"silverstripe/cms": "~3.2"
-		},
+	"require": {
+		"php": ">=5.3.2",
+		"silverstripe/framework": "~3.2",
+		"silverstripe/cms": "~3.2"
+	},
 	"require-dev": {
 		"silverstripe/postgresql": "*",
 		"silverstripe/sqlite3": "*",
 		"silverstripe/mssql": "*"
 	},
-	"extra":
-		{
-			"screenshots" : ["http://www.silverstripe.org/assets/Uploads/translatable4-small.png"]
-		},
+	"extra": {
+		"screenshots" : ["http://www.silverstripe.org/assets/Uploads/translatable4-small.png"],
+		"branch-alias": {
+			"dev-master": "2.1.x-dev"
+		}
+	},
 	"support": {
 		"issues": "https://github.com/silverstripe/silverstripe-translatable/issues?state=open"
 	},