From 4a30dfbb6c8d72ea0241cec3609a269fbe7f68f1 Mon Sep 17 00:00:00 2001
From: Julian Dehm <j.dehm@liqd.net>
Date: Wed, 9 Aug 2023 10:35:57 +0200
Subject: [PATCH] release v2308

---
 CHANGELOG.md          | 16 +++++++++++++++-
 changelog/4444.md     |  3 ---
 package.json          |  2 +-
 requirements/base.txt |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)
 delete mode 100644 changelog/4444.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 485f5a9fb8..4df425894e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,21 @@ All notable changes to this project will be documented in this file.
 Since version <unreleased> the format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 This project (not yet) adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## v2308
+
+### Changed
+
+- update a4 to mB-v2308
+- update translations
+- update dependency stylelint to v15.10.2 by @renovate in https://github.com/liqd/a4-meinberlin/pull/5212
+- update dependency bootstrap to v5.3.1 by @renovate in https://github.com/liqd/a4-meinberlin/pull/5122
+- update dependency postcss to v8.4.27 by @renovate in https://github.com/liqd/a4-meinberlin/pull/5215
+- Revert "fix(deps): update dependency bootstrap to v5.3.1" by @philli-m in https://github.com/liqd/a4-meinberlin/pull/5219
+
+### Fixed
+
+- fixed inconsistent comment count
+- fixed infinite comment scrolling
 
 ## v2307
 
diff --git a/changelog/4444.md b/changelog/4444.md
deleted file mode 100644
index 2b9097ce87..0000000000
--- a/changelog/4444.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### Changed
-
-- update a4 to 73ad60e06a557dbd00e7a1118fb639d13e8b4244
diff --git a/package.json b/package.json
index 2d4e12e33e..6004cbe3f0 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "@fortawesome/fontawesome-free": "6.4.0",
     "@maplibre/maplibre-gl-leaflet": "0.0.19",
     "acorn": "8.10.0",
-    "adhocracy4": "liqd/adhocracy4#8a5484d0b77db4bb168e5831c9026a9bddae3e14",
+    "adhocracy4": "liqd/adhocracy4#mB-v2308",
     "autoprefixer": "10.4.14",
     "bootstrap": "5.2.3",
     "copy-webpack-plugin": "11.0.0",
diff --git a/requirements/base.txt b/requirements/base.txt
index e4412dc78d..51304b73d4 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,5 +1,5 @@
 # A4
-git+https://github.com/liqd/adhocracy4.git@8a5484d0b77db4bb168e5831c9026a9bddae3e14#egg=adhocracy4
+git+https://github.com/liqd/adhocracy4.git@mB-v2308#egg=adhocracy4
 
 # Additional requirements
 brotli==1.0.9