diff --git a/CHANGES.md b/CHANGES.md index 77a56dd48..0ba0cb4ec 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -84,6 +84,7 @@ Internal Changes - Convert `namedtuples` to `attrs`. ([\#11665](https://github.com/matrix-org/synapse/issues/11665), [\#11574](https://github.com/matrix-org/synapse/issues/11574)) - Update the `/capabilities` response to include whether support for [MSC3440](https://github.com/matrix-org/matrix-doc/pull/3440) is available. ([\#11690](https://github.com/matrix-org/synapse/issues/11690)) - Send the `Accept` header in HTTP requests made using `SimpleHttpClient.get_json`. ([\#11677](https://github.com/matrix-org/synapse/issues/11677)) +- Work around Mjolnir compatibility issue by adding an import for `glob_to_regex` in `synapse.util`, where it moved from. ([\#11696](https://github.com/matrix-org/synapse/issues/11696)) Synapse 1.49.2 (2021-12-21) diff --git a/changelog.d/11696.misc b/changelog.d/11696.misc deleted file mode 100644 index e8f39dde1..000000000 --- a/changelog.d/11696.misc +++ /dev/null @@ -1 +0,0 @@ -Work around Mjolnir compatibility issue by adding an import for `glob_to_regex` in `synapse.util`, where it moved from. \ No newline at end of file