summary refs log tree commit diff
path: root/synapse/api/urls.py
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-08-19 09:44:50 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-08-19 09:44:50 +0200
commitff21d4d93bfa76a8ad20660a3513a0f122905b12 (patch)
treefa63ee538b2ad5e18c414eabc98bebed0fdc54fa /synapse/api/urls.py
parentFill user page with avatar, display name and matrix id (diff)
parentshow private room_ids rather than nulls in notifs if there is no room_alias (diff)
downloadsynapse-ff21d4d93bfa76a8ad20660a3513a0f122905b12.tar.xz
Merge remote-tracking branch 'origin/master' into user_page
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 04970adb71..05ca000787 100644
--- a/synapse/api/urls.py
+++ b/synapse/api/urls.py
@@ -17,4 +17,5 @@
 
 CLIENT_PREFIX = "/matrix/client/api/v1"
 FEDERATION_PREFIX = "/matrix/federation/v1"
-WEB_CLIENT_PREFIX = "/matrix/client"
\ No newline at end of file
+WEB_CLIENT_PREFIX = "/matrix/client"
+CONTENT_REPO_PREFIX = "/matrix/content"
\ No newline at end of file