Skip to content
Snippets Groups Projects
Commit 79c6b9e1 authored by Andrew Morgan's avatar Andrew Morgan
Browse files

Merge branch 'develop' into release-v1.62

parents b210146f bc9b0912
No related branches found
Tags v1.60.0rc2
No related merge requests found
Hide whitespace changes
Inline Side-by-side
synapse/rest/media/v1/preview_html.py
+ 2
− 1
View file @ 79c6b9e1
......@@ -20,7 +20,8 @@ from typing import (
Dict,
Generator,
Iterable,
List, Optional,
List,
Optional,
Set,
Union,
)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment