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

Release 1.1.2

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.

composer.json

@@ -16,5 +16,10 @@
 	"require":
 	{
 		"silverstripe/framework": "~3.1"
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "1.1.x-dev"
+		}
 	}
 }