Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
David Baker 2019-05-13 15:54:25 +01:00
parent 9e99143c47 8cc9ba3522
commit 516a5fb64b
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/5179.misc Normal file
View File

@ -0,0 +1 @@
Fix CI after new release of isort.

1
synapse/server.pyi
View File

@ -18,7 +18,6 @@ import synapse.server_notices.server_notices_sender
import synapse.state import synapse.state
import synapse.storage import synapse.storage
class HomeServer(object): class HomeServer(object):
@property @property
def config(self) -> synapse.config.homeserver.HomeServerConfig: def config(self) -> synapse.config.homeserver.HomeServerConfig: