From e10fccdc7755074b0671954457bcb96f69739530 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 15:08:38 -0600 Subject: [PATCH 1/2] Updates branch aliases - dev-master => 2.11.x-dev - dev-develop => 2.12.x-dev --- composer.json | 4 ++-- composer.lock | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 07be654d..e76be2f8 100644 --- a/composer.json +++ b/composer.json @@ -66,8 +66,8 @@ }, "extra": { "branch-alias": { - "dev-master": "2.10-dev", - "dev-develop": "2.11-dev" + "dev-master": "2.11.x-dev", + "dev-develop": "2.12.x-dev" }, "zf": { "component": "Zend\\Form", diff --git a/composer.lock b/composer.lock index 11c76bc5..89d20c15 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": "076005ff7bc586421e47974a51766dd1", + "content-hash": "074939c74d653dc3cbcdd0e34979b00b", "packages": [ { "name": "container-interop/container-interop", From dd816f321cd3d9bacc16caf3697e42491626cfc9 Mon Sep 17 00:00:00 2001 From: Matthew Weier O'Phinney Date: Wed, 6 Dec 2017 15:08:58 -0600 Subject: [PATCH 2/2] Adds date for 2.11.0 release to CHANGELOG --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 446fa434..271dcd0e 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.11.0 - TBD +## 2.11.0 - 2017-12-06 ### Added