summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-10-02 12:56:40 +0100
committerRichard van der Hoff <richard@matrix.org>2020-10-02 12:56:40 +0100
commit9de6e9e249d7d2940e847b68fe9995154b1a3f74 (patch)
treea72dcd37fb238d650e908ca52af6d9d58f2bb143
parentlinkify changelog (diff)
downloadsynapse-9de6e9e249d7d2940e847b68fe9995154b1a3f74.tar.xz
move #8444 to 'feature' v1.21.0rc2
-rw-r--r--CHANGES.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 0437e420bc..5d4e80499e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,13 +1,17 @@
 Synapse 1.21.0rc2 (2020-10-02)
 ==============================
 
+Features
+--------
+
+- Convert additional templates from inline HTML to Jinja2 templates. ([\#8444](https://github.com/matrix-org/synapse/issues/8444))
+
 Bugfixes
 --------
 
 - Fix a regression in v1.21.0rc1 which broke thumbnails of remote media. ([\#8438](https://github.com/matrix-org/synapse/issues/8438))
 - Do not expose the experimental `uk.half-shot.msc2778.login.application_service` flow in the login API, which caused a compatibility problem with Element iOS. ([\#8440](https://github.com/matrix-org/synapse/issues/8440))
 - Fix malformed log line in new federation "catch up" logic. ([\#8442](https://github.com/matrix-org/synapse/issues/8442))
-- Convert additional templates from inline HTML to Jinja2 templates. ([\#8444](https://github.com/matrix-org/synapse/issues/8444))
 - Fix DB query on startup for negative streams which caused long start up times. Introduced in [\#8374](https://github.com/matrix-org/synapse/issues/8374). ([\#8447](https://github.com/matrix-org/synapse/issues/8447))