From 3bc58a5a63ef6ba1e42261cc842997ef071035d2 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 10 Apr 2018 12:07:35 -0500
Subject: [PATCH 1/2] Updates branch aliases

- dev-master => 2.6.x-dev
- dev-develop => 2.7.x-dev
---
 composer.json | 4 ++--
 composer.lock | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 5b30c7d32..df542b948 100644
--- a/composer.json
+++ b/composer.json
@@ -19,8 +19,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.5.x-dev",
-            "dev-develop": "2.6.x-dev"
+            "dev-master": "2.6.x-dev",
+            "dev-develop": "2.7.x-dev"
         }
     },
     "autoload-dev": {
diff --git a/composer.lock b/composer.lock
index 269d40076..f05b0c500 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": "a358fba4f5aa3447bb7fdf9b9d4c6f88",
+    "content-hash": "d8621fbd9aac5b2d5f2b818c07eb6f2d",
     "packages": [
         {
             "name": "container-interop/container-interop",

From 68e13a624bd5013063d4d686e437c44a2f1736c2 Mon Sep 17 00:00:00 2001
From: Matthew Weier O'Phinney <matthew@zend.com>
Date: Tue, 10 Apr 2018 12:07:57 -0500
Subject: [PATCH 2/2] Sets date for 2.6.0 release in CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed77a356b..b839a465c 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.6.0 - TBD
+## 2.6.0 - 2018-04-10
 
 ### Added