From a98e5cbb2ae778b98ffbb0c3756df59ca347f91b Mon Sep 17 00:00:00 2001 From: Sebastian Ertner Date: Fri, 29 Apr 2022 13:43:03 +0200 Subject: [PATCH] DHLGW-1235: prepare release 2.6.0 --- CHANGELOG.md | 12 ++++++++++++ composer.json | 7 +------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a0417c..01adaba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## 2.6.0 + +Magento 2.4.4 compatibility release + +### Added + +- Support for Magento 2.4.4 + +### Removed + +- Support for PHP 7.1 + ## 2.5.0 ### Added diff --git a/composer.json b/composer.json index 59906b6..050f11e 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "dhl/shipping-m2", "description": "DHL multi-division shipping extension for Magento 2", "type": "metapackage", - "version": "2.5.0", + "version": "2.6.0", "license": "OSL-3.0", "require": { "deutschepost/module-autocomplete-m2": "~1.3.0", @@ -12,10 +12,5 @@ "dhl/module-carrier-paket-returns": "~2.2.0", "netresearch/module-interactive-batch-processing": "~1.1.0", "netresearch/module-shipping-ui": "~2.3.0" - }, - "extra": { - "branch-alias": { - "dev-develop": "2.6.0.x-dev" - } } }