summary refs log tree commit diff
path: root/synapse/api/constants.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 16:28:36 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-08-20 16:28:36 +0100
commitce2a7ed6e435cba44df386e718cdccecc119d333 (patch)
treeaa73f75d9ba9c70fdbb18ecf6d9237889f154933 /synapse/api/constants.py
parentMerge branch 'develop' into auth (diff)
parentMerge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-ce2a7ed6e435cba44df386e718cdccecc119d333.tar.xz
Merge branch 'develop' into auth
Diffstat (limited to 'synapse/api/constants.py')
-rw-r--r--synapse/api/constants.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index 7156ee4e7d..1423986c1e 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -76,6 +76,8 @@ class EventTypes(object):
     Feedback = "m.room.message.feedback"
 
     RoomHistoryVisibility = "m.room.history_visibility"
+    CanonicalAlias = "m.room.canonical_alias"
+    RoomAvatar = "m.room.avatar"
 
     # These are used for validation
     Message = "m.room.message"