Merge pull request #24 from tractorcow/pulls/release-112

Release 1.1.2
silverstripe · Nov 19, 2015 · ac27101 · ac27101
2 parents 9b3d3be + be424c1
commit ac27101
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/changelog.md b/changelog.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.2]
+
+* Bring up to supported module standard.
+
 ## [1.1.1]
 
-Changelog added.
+* Changelog added.
diff --git a/composer.json b/composer.json
@@ -16,5 +16,10 @@
 	"require":
 	{
 		"silverstripe/framework": "~3.1"
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "1.1.x-dev"
+		}
 	}
 }