Skip to content
Snippets Groups Projects
Commit 516a5fb6 authored by David Baker's avatar David Baker
Browse files

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

parents 9e99143c 8cc9ba35
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
changelog.d/5179.misc 0 → 100644
+ 1
− 0
View file @ 516a5fb6
Fix CI after new release of isort.
synapse/server.pyi
+ 0
− 1
View file @ 516a5fb6
......@@ -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:
......
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