From 36ea185103bc6618ffe3e176194891940eabb8c3 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Thu, 26 Dec 2019 15:41:06 -0600 Subject: [PATCH] 1.3.0 readiness - Updates branch aliases: - dev-master => 1.3.x-dev - dev-develop => 2.0.x-dev - Sets date for 1.3.0 release in CHANGELOG --- CHANGELOG.md | 2 +- composer.json | 4 ++-- composer.lock | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f0b07c..8667e3c 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.3.0 - TBD +## 1.3.0 - 2019-12-26 ### Added diff --git a/composer.json b/composer.json index 49828c8..59d2891 100644 --- a/composer.json +++ b/composer.json @@ -54,8 +54,8 @@ }, "extra": { "branch-alias": { - "dev-master": "1.2.x-dev", - "dev-develop": "1.3.x-dev" + "dev-master": "1.3.x-dev", + "dev-develop": "2.0.x-dev" }, "zf": { "module": "ZendDeveloperTools" diff --git a/composer.lock b/composer.lock index bf73a2e..bf84c69 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": "f5c36c3f50ccfe9695634b7cb0c324f4", + "content-hash": "c2f88e841f172ac9bd2ab7caacb786f5", "packages": [ { "name": "container-interop/container-interop", @@ -1788,7 +1788,6 @@ "mock", "xunit" ], - "abandoned": true, "time": "2018-04-11T04:50:36+00:00" }, {