diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:25:40 +0100 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2015-08-20 16:25:40 +0100 |
| commit | e8cf77fa496de10246735fa8a11020663285bdd2 (patch) | |
| tree | 7dfcf1f24dd965c8d34331fc70d1b17fbb6f03ad /synapse/api/constants.py | |
| parent | /tokenrefresh POST endpoint (diff) | |
| parent | Merge branch 'release-v0.10.0' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-e8cf77fa496de10246735fa8a11020663285bdd2.tar.xz | |
Merge branch 'develop' into refresh
Conflicts: synapse/rest/client/v1/login.py
Diffstat (limited to 'synapse/api/constants.py')
| -rw-r--r-- | synapse/api/constants.py | 2 |
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" |