summary refs log tree commit diff
path: root/synapse/api/urls.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-20 15:55:39 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-20 15:55:39 +0100
commitca03f90ee770d30831448889318bfc92c85daec6 (patch)
tree3b574c7bf4c27ba37bad1b7b5c7e16a540cdd11c /synapse/api/urls.py
parentMerge tag 'v0.99.4rc1' into matrix-org-hotfixes (diff)
parentAdd a test room version which updates event ID format (#5210) (diff)
downloadsynapse-ca03f90ee770d30831448889318bfc92c85daec6.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/api/urls.py')
-rw-r--r--synapse/api/urls.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/api/urls.py b/synapse/api/urls.py

index cb71d80875..3c6bddff7a 100644 --- a/synapse/api/urls.py +++ b/synapse/api/urls.py
@@ -22,8 +22,7 @@ from six.moves.urllib.parse import urlencode from synapse.config import ConfigError -CLIENT_PREFIX = "/_matrix/client/api/v1" -CLIENT_V2_ALPHA_PREFIX = "/_matrix/client/v2_alpha" +CLIENT_API_PREFIX = "/_matrix/client" FEDERATION_PREFIX = "/_matrix/federation" FEDERATION_V1_PREFIX = FEDERATION_PREFIX + "/v1" FEDERATION_V2_PREFIX = FEDERATION_PREFIX + "/v2"