diff --git a/CHANGELOG.md b/changelog.md similarity index 58% rename from CHANGELOG.md rename to changelog.md index 6399621..b7b7fff 100644 --- a/CHANGELOG.md +++ b/changelog.md @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [1.0.9] + +* Alias dev-master as 1.0 +* Update license year +* Add code of conduct +* Update documentation for userguide +* Update translations + ## [1.0.8] * Changelog added. diff --git a/composer.json b/composer.json index a326054..aa44403 100644 --- a/composer.json +++ b/composer.json @@ -10,9 +10,13 @@ "email": "mateusz@silverstripe.com" } ], - "require": - { + "require": { "silverstripe/framework": "3.*", "silverstripe/cms": "3.*" + }, + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } } -} \ No newline at end of file +}