From de079f8462c8962dc22df7c26d9914ade6760cfc Mon Sep 17 00:00:00 2001
From: ismailgulek <ismailg@matrix.org>
Date: Mon, 13 Jun 2022 17:56:34 +0300
Subject: [PATCH] Add changelog

---
 changelog.d/6242.bugfix | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/6242.bugfix

diff --git a/changelog.d/6242.bugfix b/changelog.d/6242.bugfix
new file mode 100644
index 000000000..72f602aa8
--- /dev/null
+++ b/changelog.d/6242.bugfix
@@ -0,0 +1 @@
+Room: Avoid merging of bubbles if current timeline style does not allow.