diff options
author | Neil Johnson <neil@matrix.org> | 2018-08-15 17:20:38 +0100 |
---|---|---|
committer | Neil Johnson <neil@matrix.org> | 2018-08-15 17:20:38 +0100 |
commit | 8cfad2e68630115a5ac4c3572b2183635c3ff029 (patch) | |
tree | 0649489c05db884455483d804304afcaa0cef509 /changelog.d | |
parent | Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_not... (diff) | |
parent | Merge pull request #3689 from matrix-org/neilj/fix_off_by_1+maus (diff) | |
download | synapse-8cfad2e68630115a5ac4c3572b2183635c3ff029.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into neilj/server_notices_on_blocking
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/3568.feature | 1 | ||||
-rw-r--r-- | changelog.d/3689.bugfix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/3568.feature b/changelog.d/3568.feature new file mode 100644 index 0000000000..247f02ba4e --- /dev/null +++ b/changelog.d/3568.feature @@ -0,0 +1 @@ +speed up /members API and add `at` and `membership` params as per MSC1227 diff --git a/changelog.d/3689.bugfix b/changelog.d/3689.bugfix new file mode 100644 index 0000000000..934d039836 --- /dev/null +++ b/changelog.d/3689.bugfix @@ -0,0 +1 @@ +Fix mau blocking calulation bug on login |