summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-20 11:26:09 +0100
committerErik Johnston <erik@matrix.org>2015-08-20 11:26:09 +0100
commitcbd053bb8f0e5732f88a6ca3a9b8209ec41d7975 (patch)
treed36a52e67cdd805d45a7a90d5f546a4e819b99b8 /synapse/api
parentMerge pull request #234 from matrix-org/email_login (diff)
parentCheck that the canonical room alias actually points to the room (diff)
downloadsynapse-cbd053bb8f0e5732f88a6ca3a9b8209ec41d7975.tar.xz
Merge pull request #233 from matrix-org/erikj/canonical_alias
Add server side support for canonical aliases
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 7156ee4e7d..60a0d336da 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -76,6 +76,7 @@ class EventTypes(object):
     Feedback = "m.room.message.feedback"
 
     RoomHistoryVisibility = "m.room.history_visibility"
+    CanonicalAlias = "m.room.canonical_alias"
 
     # These are used for validation
     Message = "m.room.message"