summary refs log tree commit diff
path: root/synapse/api/urls.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-02-05 11:04:24 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-02-05 11:04:24 +0000
commit489f92e0e5cc386078efc91699cf1344808c7b9b (patch)
treee10a6d5dad7e4bddf552d466f113b16b6bba215f /synapse/api/urls.py
parentMerge pull request #558 from matrix-org/daniel/config (diff)
parentHost /media/r0 as well as /media/v1 (diff)
downloadsynapse-489f92e0e5cc386078efc91699cf1344808c7b9b.tar.xz
Merge pull request #559 from matrix-org/daniel/media
Host /media/r0 as well as /media/v1
Diffstat (limited to 'synapse/api/urls.py')
-rw-r--r--synapse/api/urls.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/api/urls.py b/synapse/api/urls.py
index 19824f9a02..0fd9b7f244 100644
--- a/synapse/api/urls.py
+++ b/synapse/api/urls.py
@@ -23,5 +23,6 @@ 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/v1"
+MEDIA_PREFIX = "/_matrix/media/r0"
+LEGACY_MEDIA_PREFIX = "/_matrix/media/v1"
 APP_SERVICE_PREFIX = "/_matrix/appservice/v1"