Merge branch 'develop' into release-v1.62

anoadragon453 · anoadragon453 · commit 79c6b9e12b60 · 2022-06-28T16:47:21.000+01:00
diff --git a/synapse/rest/media/v1/preview_html.py b/synapse/rest/media/v1/preview_html.py
@@ -20,7 +20,8 @@
     Dict,
     Generator,
     Iterable,
-   List, Optional,
+    List,
+    Optional,
     Set,
     Union,
 )
