diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ac3fca88b..f00d44aaea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## Unreleased +### Added +- Add support for pr merge with prior rebase ([#1332](https://github.com/scm-manager/scm-manager/pull/1332)) + ## [2.5.0] - 2020-09-10 ### Added - Tags now have date information attached ([#1305](https://github.com/scm-manager/scm-manager/pull/1305))