diff options
| author | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
|---|---|---|
| committer | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
| commit | d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e (patch) | |
| tree | c832189c0f04fa02354feb419d72d6ad64b0e77f /synapse/api | |
| parent | pep8 (diff) | |
| parent | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades (diff) | |
| download | synapse-d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e.tar.xz | |
Merge branch 'develop' into travis/login-terms
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/constants.py | 1 | ||||
| -rw-r--r-- | synapse/api/urls.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index b2815da0ab..f5928633d2 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -62,6 +62,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" diff --git a/synapse/api/urls.py b/synapse/api/urls.py index 6d9f1ca0ef..f78695b657 100644 --- a/synapse/api/urls.py +++ b/synapse/api/urls.py @@ -28,7 +28,6 @@ FEDERATION_PREFIX = "/_matrix/federation/v1" STATIC_PREFIX = "/_matrix/static" WEB_CLIENT_PREFIX = "/_matrix/client" CONTENT_REPO_PREFIX = "/_matrix/content" -SERVER_KEY_PREFIX = "/_matrix/key/v1" SERVER_KEY_V2_PREFIX = "/_matrix/key/v2" MEDIA_PREFIX = "/_matrix/media/r0" LEGACY_MEDIA_PREFIX = "/_matrix/media/v1" |