From 329589d1c4a0387ae43bc7089f6dd1e30aa7576f Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Tue, 17 Apr 2018 12:53:58 -0500 Subject: [PATCH 1/2] Updates branch aliases - dev-master => 1.2.x-dev - dev-develop => 1.3.x-dev --- composer.json | 4 ++-- composer.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index e564b25..e873046 100644 --- a/composer.json +++ b/composer.json @@ -54,8 +54,8 @@ }, "extra": { "branch-alias": { - "dev-master": "1.1.x-dev", - "dev-develop": "1.2.x-dev" + "dev-master": "1.2.x-dev", + "dev-develop": "1.3.x-dev" }, "zf": { "module": "ZendDeveloperTools" diff --git a/composer.lock b/composer.lock index cabcdfe..3625a56 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1f39d7319b4f10b2dbca529931800fa6", + "content-hash": "9a6ae1bf6a8e4d54c5493cbefe78e83c", "packages": [ { "name": "container-interop/container-interop", From 71bfc4f4c6869ad836eac42b8078ce103e80a1ca Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Tue, 17 Apr 2018 12:54:23 -0500 Subject: [PATCH 2/2] Renames 1.1.2 to 1.2.0 and sets date for release in CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad89614..bfdb6cc 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.1.2 - TBD +## 1.2.0 - 2018-04-17 ### Added