summary refs log tree commit diff
path: root/synapse/http/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-09-01 13:41:44 +0100
committerErik Johnston <erik@matrix.org>2014-09-01 13:41:44 +0100
commit10efca1a74892610e7438ed428c3acfb0e89060b (patch)
treeddbc029565cfa9f037a2d20597c0faf280bceacc /synapse/http/server.py
parentStart adding storage for new events. (diff)
parentadd another public wishlist item (diff)
downloadsynapse-10efca1a74892610e7438ed428c3acfb0e89060b.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
Diffstat (limited to 'synapse/http/server.py')
-rw-r--r--synapse/http/server.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py

index 66f966fcaa..243b71744d 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py
@@ -325,7 +325,7 @@ class ContentRepoResource(resource.Resource): # FIXME (erikj): These should use constants. file_name = os.path.basename(fname) - url = "http://%s/matrix/content/%s" % ( + url = "http://%s/_matrix/content/%s" % ( self.hs.domain_with_port, file_name )