diff options
| author | Andrew Morgan <andrewm@element.io> | 2022-06-28 16:47:21 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrewm@element.io> | 2022-06-28 16:47:21 +0100 |
| commit | 79c6b9e12b60b3f139dee83c54aecf49a1d71cd0 (patch) | |
| tree | 541c686f093f4cdd7f7f06134798ef195ddd84be /synapse | |
| parent | 1.62.0rc1 (diff) | |
| parent | fix linting error from the 1.61.1 main -> develop merge (diff) | |
| download | synapse-79c6b9e12b60b3f139dee83c54aecf49a1d71cd0.tar.xz | |
Merge branch 'develop' into release-v1.62 v1.62.0rc1
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/rest/media/v1/preview_html.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/preview_html.py b/synapse/rest/media/v1/preview_html.py |