diff options
| author | David Baker <dave@matrix.org> | 2019-05-13 15:54:25 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2019-05-13 15:54:25 +0100 |
| commit | 516a5fb64b8f66c06b29c87b9903db328c898582 (patch) | |
| tree | 606e24b63e00b7bc7a7557eef8542d82de5d0640 | |
| parent | Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_rec... (diff) | |
| parent | Merge pull request #5179 from matrix-org/babolivier/isort (diff) | |
| download | synapse-516a5fb64b8f66c06b29c87b9903db328c898582.tar.xz | |
Merge remote-tracking branch 'origin/develop' into dbkr/add_dummy_flow_to_recaptcha_only
| -rw-r--r-- | changelog.d/5179.misc | 1 | ||||
| -rw-r--r-- | synapse/server.pyi | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/changelog.d/5179.misc b/changelog.d/5179.misc new file mode 100644 index 0000000000..92369cb2fc --- /dev/null +++ b/changelog.d/5179.misc @@ -0,0 +1 @@ +Fix CI after new release of isort. diff --git a/synapse/server.pyi b/synapse/server.pyi index 3ba3a967c2..9583e82d52 100644 --- 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: |