From 26f8a9617cb649706be2259f6ca34638ec4b17c3 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 14 Aug 2017 15:36:04 -0500 Subject: [PATCH 1/2] Updates branch aliases - dev-master => 2.10-dev - dev-develop => 2.11-dev --- composer.json | 4 ++-- composer.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 6b52eca70..a65cf39c0 100644 --- a/composer.json +++ b/composer.json @@ -45,8 +45,8 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.9-dev", - "dev-develop": "2.10-dev" + "dev-master": "2.10-dev", + "dev-develop": "2.11-dev" }, "zf": { "component": "Zend\\Validator", diff --git a/composer.lock b/composer.lock index e47398518..ae669d83c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "592dc52b9037dcdb0de561eced941e30", + "content-hash": "46afb6e9936c113e4c87a16296b9d2dd", "packages": [ { "name": "container-interop/container-interop", From a3bf50b2b0734bcb14b56f59275df8e83eb47bfe Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Mon, 14 Aug 2017 15:36:30 -0500 Subject: [PATCH 2/2] Sets date for 2.10.0 release in CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2736f85c4..81c6f1a7c 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.10.0 - TBD +## 2.10.0 - 2017-08-14 ### Added