diff --git a/CHANGELOG.md b/CHANGELOG.md index c2455bb4f5..9717cb770b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ 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). +## [2.26.1] - 2021-11-09 +### Fixed +- Concurrent modification error in SVN modify command ([#1849](https://github.com/scm-manager/scm-manager/pull/1849)) +- Fix endless loop on logout with slow connections + ## [2.26.0] - 2021-11-04 ### Added - Viewer for pdf files ([#1843](https://github.com/scm-manager/scm-manager/pull/1843)) @@ -809,3 +814,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [2.24.0]: https://scm-manager.org/download/2.24.0 [2.25.0]: https://scm-manager.org/download/2.25.0 [2.26.0]: https://scm-manager.org/download/2.26.0 +[2.26.1]: https://scm-manager.org/download/2.26.1 diff --git a/gradle/changelog/concurrent_modification.yaml b/gradle/changelog/concurrent_modification.yaml deleted file mode 100644 index 43d486b6fc..0000000000 --- a/gradle/changelog/concurrent_modification.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Concurrent modification error in SVN modify command ([#1849](https://github.com/scm-manager/scm-manager/pull/1849)) diff --git a/gradle/changelog/logout_endless_loop.yaml b/gradle/changelog/logout_endless_loop.yaml deleted file mode 100644 index 5dbe2fd4f5..0000000000 --- a/gradle/changelog/logout_endless_loop.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- type: fixed - description: Fix logout endless loop on slow connections