diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-31 18:11:00 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-01-31 18:11:00 +0000 |
| commit | bbb97a35fdaf7193e22ceacb8c155038b66651d2 (patch) | |
| tree | c166033c625605a56b3301dfdc74791f838a2a92 /synapse/config | |
| parent | lint (diff) | |
| parent | Reject large transactions on federation (#4513) (diff) | |
| download | synapse-bbb97a35fdaf7193e22ceacb8c155038b66651d2.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into anoa/room_upgrade_federatable
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/api.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/config/api.py b/synapse/config/api.py index 403d96ba76..9f25bbc5cb 100644 --- a/synapse/config/api.py +++ b/synapse/config/api.py @@ -24,6 +24,7 @@ class ApiConfig(Config): EventTypes.JoinRules, EventTypes.CanonicalAlias, EventTypes.RoomAvatar, + EventTypes.RoomEncryption, EventTypes.Name, ]) @@ -36,5 +37,6 @@ class ApiConfig(Config): - "{JoinRules}" - "{CanonicalAlias}" - "{RoomAvatar}" + - "{RoomEncryption}" - "{Name}" """.format(**vars(EventTypes)) |