Alias master as 1.2.x-dev

2016-02-04 17:43:50 +13:00 · 2016-02-04 17:43:50 +13:00 · ddb56be86f
parent df34386bb1
commit ddb56be86f
2 changed files with 6 additions and 0 deletions
--- 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
--- a/composer.json
+++ b/composer.json
@ -20,5 +20,10 @@
 	},
 	"require": {
 		"silverstripe/framework": "~3.1"
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "1.2.x-dev"
+		}
 	}
 }