diff options
| author | Erik Johnston <erik@matrix.org> | 2019-06-18 16:11:43 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-06-18 16:11:43 +0100 |
| commit | 19b80fe68a9e594dd00878ae8a2d34f94000755b (patch) | |
| tree | 21708e4462b2dcf551f717e4c8188cd561171591 /synapse/api/urls.py | |
| parent | Newsfile (diff) | |
| parent | Fix seven contrib files with Python syntax errors (#5446) (diff) | |
| download | synapse-19b80fe68a9e594dd00878ae8a2d34f94000755b.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fix_get_missing_events_error
Diffstat (limited to 'synapse/api/urls.py')
| -rw-r--r-- | synapse/api/urls.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/api/urls.py b/synapse/api/urls.py index 8102176653..e16c386a14 100644 --- a/synapse/api/urls.py +++ b/synapse/api/urls.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Copyright 2014-2016 OpenMarket Ltd -# Copyright 2018 New Vector Ltd. +# Copyright 2018 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,11 +22,11 @@ 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" +FEDERATION_UNSTABLE_PREFIX = FEDERATION_PREFIX + "/unstable" STATIC_PREFIX = "/_matrix/static" WEB_CLIENT_PREFIX = "/_matrix/client" CONTENT_REPO_PREFIX = "/_matrix/content" |