diff --git a/changelog.md b/changelog.md index ba47a2d..7739ba5 100644 --- 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 index 24c55f5..f92d4c9 100644 --- a/composer.json +++ b/composer.json @@ -16,5 +16,10 @@ "require": { "silverstripe/framework": "~3.1" + }, + "extra": { + "branch-alias": { + "dev-master": "1.1.x-dev" + } } }