summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2023-02-08 00:12:22 +0000
committerDavid Robertson <davidr@element.io>2023-02-08 00:12:22 +0000
commit236f6dfc8c5702b12c80ee11c66d8345a462279c (patch)
tree657b1cc227337de3eb0e2e443708b545498e5ed2
parentHacky fix to make mac wheels (#15019) (diff)
downloadsynapse-236f6dfc8c5702b12c80ee11c66d8345a462279c.tar.xz
Manually add new news fragments
-rw-r--r--CHANGES.md2
-rw-r--r--changelog.d/15016.feature1
-rw-r--r--changelog.d/15019.misc1
3 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 1951ea931d..80f41615a0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -8,6 +8,7 @@ Features
 - Adds profile information, devices and connections to the user data export via command line. ([\#14894](https://github.com/matrix-org/synapse/issues/14894))
 - Experimental support to suppress notifications from message edits ([MSC3958](https://github.com/matrix-org/matrix-spec-proposals/pull/3958)). ([\#14960](https://github.com/matrix-org/synapse/issues/14960))
 - Improve performance when joining or sending an event large rooms. ([\#14962](https://github.com/matrix-org/synapse/issues/14962))
+- Experimental support to suppress notifications from message edits ([MSC3958](https://github.com/matrix-org/matrix-spec-proposals/pull/3958)). ([\#15016](https://github.com/matrix-org/synapse/issues/15016))
 
 
 Bugfixes
@@ -56,6 +57,7 @@ Internal Changes
 - Bump serde_json from 1.0.91 to 1.0.92. ([\#14997](https://github.com/matrix-org/synapse/issues/14997))
 - Bump isort from 5.11.4 to 5.11.5. ([\#14998](https://github.com/matrix-org/synapse/issues/14998))
 - Bump phonenumbers from 8.13.4 to 8.13.5. ([\#14999](https://github.com/matrix-org/synapse/issues/14999))
+- Fix creation of wheels on macOS. ([\#15019](https://github.com/matrix-org/synapse/issues/15019))
 
 
 Synapse 1.76.0 (2023-01-31)
diff --git a/changelog.d/15016.feature b/changelog.d/15016.feature
deleted file mode 100644
index b9bb331273..0000000000
--- a/changelog.d/15016.feature
+++ /dev/null
@@ -1 +0,0 @@
-Experimental support to suppress notifications from message edits ([MSC3958](https://github.com/matrix-org/matrix-spec-proposals/pull/3958)).
diff --git a/changelog.d/15019.misc b/changelog.d/15019.misc
deleted file mode 100644
index bfc1d0f6ce..0000000000
--- a/changelog.d/15019.misc
+++ /dev/null
@@ -1 +0,0 @@
-Fix creation of wheels on macOS.