Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_recaptcha_only

2019-05-13 15:54:25 +01:00 · 2019-05-13 15:54:25 +01:00 · 516a5fb64b
parent 9e99143c47 8cc9ba3522
commit 516a5fb64b
2 changed files with 1 additions and 1 deletions
--- a/changelog.d/5179.misc
+++ b/changelog.d/5179.misc
@ -0,0 +1 @@
+Fix CI after new release of isort.
--- a/synapse/server.pyi
+++ b/synapse/server.pyi
@ -18,7 +18,6 @@ import synapse.server_notices.server_notices_sender
 import synapse.state
 import synapse.storage

-
 class HomeServer(object):
    @property
    def config(self) -> synapse.config.homeserver.HomeServerConfig: