diff options
author | Erik Johnston <erik@matrix.org> | 2020-03-02 16:55:55 +0000 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2020-03-02 16:55:55 +0000 |
commit | 65a941d1f8e4a27c56ad015369219a2e7c577a01 (patch) | |
tree | 442d9e11867521f021b3cb05531af9c446d7c4ef /changelog.d | |
parent | Fix worker handling (diff) | |
parent | Always return a deferred from `get_current_state_deltas`. (#7019) (diff) | |
download | synapse-65a941d1f8e4a27c56ad015369219a2e7c577a01.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fixup_devices_stream
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/6910.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/6995.misc | 1 | ||||
-rw-r--r-- | changelog.d/7015.misc | 1 | ||||
-rw-r--r-- | changelog.d/7018.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/7019.misc | 1 |
5 files changed, 4 insertions, 1 deletions
diff --git a/changelog.d/6910.bugfix b/changelog.d/6910.bugfix deleted file mode 100644 index 707f1ff7b5..0000000000 --- a/changelog.d/6910.bugfix +++ /dev/null @@ -1 +0,0 @@ -Fixed set a user as an admin with the admin API `PUT /_synapse/admin/v2/users/<user_id>`. Contributed by @dklimpel. diff --git a/changelog.d/6995.misc b/changelog.d/6995.misc new file mode 100644 index 0000000000..884b4cf4ee --- /dev/null +++ b/changelog.d/6995.misc @@ -0,0 +1 @@ +Add some type annotations to the federation base & client classes. diff --git a/changelog.d/7015.misc b/changelog.d/7015.misc new file mode 100644 index 0000000000..9709dc606e --- /dev/null +++ b/changelog.d/7015.misc @@ -0,0 +1 @@ +Change date in INSTALL.md#tls-certificates for last date of getting TLS certificates to November 2019. \ No newline at end of file diff --git a/changelog.d/7018.bugfix b/changelog.d/7018.bugfix new file mode 100644 index 0000000000..d1b6c1d464 --- /dev/null +++ b/changelog.d/7018.bugfix @@ -0,0 +1 @@ +Fix py35-old CI by using native tox package. diff --git a/changelog.d/7019.misc b/changelog.d/7019.misc new file mode 100644 index 0000000000..5130f4e8af --- /dev/null +++ b/changelog.d/7019.misc @@ -0,0 +1 @@ +Port `synapse.handlers.presence` to async/await. |