diff options
| author | Erik Johnston <erik@matrix.org> | 2020-02-06 11:04:03 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2020-02-06 11:04:03 +0000 |
| commit | 2201ef8556a5b9aae48f9dc4a7b7b8b7c00940cd (patch) | |
| tree | 4942a7e144158592e72efa30a73727ec13ffde99 /synapse/handlers/room.py | |
| parent | Merge pull request #6855 from matrix-org/clokep/readme-pip-install (diff) | |
| parent | Update changelog (diff) | |
| download | synapse-2201ef8556a5b9aae48f9dc4a7b7b8b7c00940cd.tar.xz | |
Merge tag 'v1.10.0rc2' into develop
Synapse 1.10.0rc2 (2020-02-06) ============================== Bugfixes -------- - Fix an issue with cross-signing where device signatures were not sent to remote servers. ([\#6844](https://github.com/matrix-org/synapse/issues/6844)) - Fix to the unknown remote device detection which was introduced in 1.10.rc1. ([\#6848](https://github.com/matrix-org/synapse/issues/6848)) Internal Changes ---------------- - Detect unexpected sender keys on remote encrypted events and resync device lists. ([\#6850](https://github.com/matrix-org/synapse/issues/6850))
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 1382399557..b609a65f47 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -360,7 +360,7 @@ class RoomCreationHandler(BaseHandler): (EventTypes.RoomHistoryVisibility, ""), (EventTypes.GuestAccess, ""), (EventTypes.RoomAvatar, ""), - (EventTypes.Encryption, ""), + (EventTypes.RoomEncryption, ""), (EventTypes.ServerACL, ""), (EventTypes.RelatedGroups, ""), (EventTypes.PowerLevels, ""), |