diff options
author | Patrick Cloke <patrickc@matrix.org> | 2021-10-12 14:21:05 -0400 |
---|---|---|
committer | Patrick Cloke <patrickc@matrix.org> | 2021-10-12 14:21:05 -0400 |
commit | 9abc5f2a051f8ab49cb7a51f80bda78fbee6aa07 (patch) | |
tree | 4f32d577953922d65d981ed3a9c3a2e0f4e53b0e | |
parent | Add tests for `MediaFilePaths` (#11057) (diff) | |
parent | Fix formatting string when oEmbed errors occur. (#11061) (diff) | |
download | synapse-9abc5f2a051f8ab49cb7a51f80bda78fbee6aa07.tar.xz |
Merge remote-tracking branch 'origin/release-v1.45' into develop
-rw-r--r-- | changelog.d/11061.bugfix | 1 | ||||
-rw-r--r-- | synapse/rest/media/v1/oembed.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/11061.bugfix b/changelog.d/11061.bugfix new file mode 100644 |