diff --git a/CHANGELOG.md b/CHANGELOG.md index edcd948..e4f8d85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. -## 1.2.0 - TBD +## 1.2.0 - 2016-07-14 ### Added diff --git a/composer.json b/composer.json index 7895e4a..5914e63 100644 --- a/composer.json +++ b/composer.json @@ -20,8 +20,8 @@ }, "extra": { "branch-alias": { - "dev-master": "1.1-dev", - "dev-develop": "1.2-dev" + "dev-master": "1.2-dev", + "dev-develop": "1.3-dev" }, "zf": { "module": "ZF\\Apigility\\Documentation\\Swagger"