diff options
author | Richard van der Hoff <richard@matrix.org> | 2020-04-22 13:09:23 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2020-04-22 13:09:23 +0100 |
commit | 2aa5bf13c80726d7211cf251b837b10708ec456d (patch) | |
tree | 0b1ef558d52b093b7306d8cb3eb2b05a043555c6 /changelog.d | |
parent | Add ability to run replication protocol over redis. (#7040) (diff) | |
parent | Do not treat display names as globs for push rules. (#7271) (diff) | |
download | synapse-2aa5bf13c80726d7211cf251b837b10708ec456d.tar.xz |
Merge branch 'release-v1.12.4' into develop
Diffstat (limited to 'changelog.d')
-rw-r--r-- | changelog.d/7289.bugfix | 1 | ||||
-rw-r--r-- | changelog.d/7311.feature | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/7289.bugfix b/changelog.d/7289.bugfix new file mode 100644 index 0000000000..84699e50a9 --- /dev/null +++ b/changelog.d/7289.bugfix @@ -0,0 +1 @@ +Fix a bug with cross-signing devices belonging to remote users who did not share a room with any user on the local homeserver. diff --git a/changelog.d/7311.feature b/changelog.d/7311.feature new file mode 100644 index 0000000000..c3adc1d6e7 --- /dev/null +++ b/changelog.d/7311.feature @@ -0,0 +1 @@ +Add support for handling GET requests for account_data on a worker. |