From 334c740d28a0ecc593f70c99759571a4ccdee5e5 Mon Sep 17 00:00:00 2001 From: Enrico Zimuel Date: Thu, 1 Feb 2018 11:14:52 +0100 Subject: [PATCH] Update develop after 2.6.0 release --- CHANGELOG.md | 44 ++++++++++++++++++++++++++++++++++++++++++++ composer.json | 4 ++-- 2 files changed, 46 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2161d1cf..7f695262 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,50 @@ All notable changes to this project will be documented in this file, in reverse chronological order by release. +## 2.7.0 - TBD + +### Added + +- Nothing. + +### Changed + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- Nothing. + +## 2.6.1 - TBD + +### Added + +- Nothing. + +### Changed + +- Nothing. + +### Deprecated + +- Nothing. + +### Removed + +- Nothing. + +### Fixed + +- Nothing. + ## 2.6.0 - 2018-02-01 ### Added diff --git a/composer.json b/composer.json index 34917005..d9ed34ac 100644 --- a/composer.json +++ b/composer.json @@ -19,8 +19,8 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "2.5-dev", - "dev-develop": "2.6-dev" + "dev-master": "2.6-dev", + "dev-develop": "2.7-dev" } }, "autoload-dev": {