summary refs log tree commit diff
path: root/synapse/api/constants.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-10-29 18:16:58 +0000
committerErik Johnston <erik@matrix.org>2018-10-29 18:16:58 +0000
commitf8281f42c8710d4dcefa5dd1e7e2ac93481d231e (patch)
tree4aedf75dafeff0d7c3c0a29abe6934b777f37e63 /synapse/api/constants.py
parentMerge remote-tracking branch 'origin/develop' into matrix-org-hotfixes (diff)
parentMerge pull request #4109 from matrix-org/erikj/repl_devices (diff)
downloadsynapse-f8281f42c8710d4dcefa5dd1e7e2ac93481d231e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
Diffstat (limited to 'synapse/api/constants.py')
-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 c2630c4c64..5565e516d6 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py
@@ -61,6 +61,7 @@ class LoginType(object): class EventTypes(object): Member = "m.room.member" Create = "m.room.create" + Tombstone = "m.room.tombstone" JoinRules = "m.room.join_rules" PowerLevels = "m.room.power_levels" Aliases = "m.room.aliases"