diff --git a/CHANGELOG.md b/CHANGELOG.md index fb77637..ea29ba9 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.2.0] + +* API Add option to specify http / https on subsite domains + ## [1.1.0] * Changelog added. diff --git a/composer.json b/composer.json index 82e472b..09d67b8 100644 --- a/composer.json +++ b/composer.json @@ -16,10 +16,5 @@ }, "require-dev": { "phpunit/PHPUnit": "~3.7@stable" - }, - "extra": { - "branch-alias": { - "dev-master": "1.1.x-dev" - } - } + } }