summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-05-13 15:48:29 +0100
committerGitHub <noreply@github.com>2019-05-13 15:48:29 +0100
commit8cc9ba35225e4cc94e41992730edb4b4889fd499 (patch)
tree1e4b88fd2aee1dd306b851bbea496cec50fc5ae9
parentMerge branch 'master' into develop (diff)
parentFix changelog (diff)
downloadsynapse-8cc9ba35225e4cc94e41992730edb4b4889fd499.tar.xz
Merge pull request #5179 from matrix-org/babolivier/isort
Fix CI after new release of isort
-rw-r--r--changelog.d/5179.misc1
-rw-r--r--synapse/server.pyi1
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: