summary refs log tree commit diff
path: root/synapse/api/urls.py
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-05-15 23:30:22 -0500
committerAmber Brown <hawkowl@atleastfornow.net>2019-05-15 23:30:22 -0500
commitd424ba9e5bbcb63ae3929401a27cb89ac269938f (patch)
tree45a6f462ab3b34091193665f5a2e0c5bf195dcbe /synapse/api/urls.py
parentMerge remote-tracking branch 'origin/develop' into shhs (diff)
parentMake all the rate limiting options more consistent (#5181) (diff)
downloadsynapse-d424ba9e5bbcb63ae3929401a27cb89ac269938f.tar.xz
Merge remote-tracking branch 'origin/develop' into shhs
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"