From 1ae2c0de232c7c5e85ffe7483511047cda91cedd Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 30 Apr 2018 16:21:37 -0500 Subject: [PATCH 1/2] Updates branch aliases - dev-master => 2.4.x-dev - dev-develop => 2.5.x-dev --- composer.json | 4 ++-- composer.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 12ce4af..4f31bab 100644 --- a/composer.json +++ b/composer.json @@ -51,8 +51,8 @@ "branch-alias": { "dev-release-1.0": "1.0.x-dev", "dev-release-1.1": "1.1.x-dev", - "dev-master": "2.3.x-dev", - "dev-develop": "2.4.x-dev" + "dev-master": "2.4.x-dev", + "dev-develop": "2.5.x-dev" }, "zf": { "component": "Zend\\Hydrator", diff --git a/composer.lock b/composer.lock index 7e56a26..6f68227 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "4e8a90b90dd71dc4a5ef7e2afd7727af", + "content-hash": "a815a8d341a8df490f33547a951fd588", "packages": [ { "name": "zendframework/zend-stdlib", From 5ba5a9e824be21be12042a53d5b71f2fc33c0d63 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 30 Apr 2018 16:22:07 -0500 Subject: [PATCH 2/2] Adds date for 2.4.0 release to CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6f70eb..92e8672 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. -## 2.4.0 - TBD +## 2.4.0 - 2018-04-30 ### Added