summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-04-02 18:25:45 +0100
committerErik Johnston <erik@matrix.org>2019-04-02 18:25:45 +0100
commit613b443ff006c464b9d9fe839c912661b51c4940 (patch)
tree9efde7a05c9a1a1f2517ef4789d54e27a322865a /synapse/api
parentRemove spurious changelog files from hotfixes (diff)
parentMerge pull request #4991 from matrix-org/erikj/stagger_push_startup (diff)
downloadsynapse-613b443ff006c464b9d9fe839c912661b51c4940.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/constants.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py

index dc913feeee..dd373fa4b8 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py
@@ -69,6 +69,7 @@ class EventTypes(object): Redaction = "m.room.redaction" ThirdPartyInvite = "m.room.third_party_invite" Encryption = "m.room.encryption" + RelatedGroups = "m.room.related_groups" RoomHistoryVisibility = "m.room.history_visibility" CanonicalAlias = "m.room.canonical_alias"