summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <github@rvanderhoff.org.uk>2017-10-27 10:53:48 +0100
committerGitHub <noreply@github.com>2017-10-27 10:53:48 +0100
commit8854c039f2423ba12fc355609f7fd401b6a121be (patch)
treeeca945653fe3c5d36dfcc4ebaa337e5fc9164e3e
parentMerge pull request #2584 from matrix-org/rav/fix_httpclient_logcontexts (diff)
parentSupport /keys/upload on /r0 as well as /unstable (diff)
downloadsynapse-8854c039f2423ba12fc355609f7fd401b6a121be.tar.xz
Merge pull request #2585 from matrix-org/rav/unstable_to_r0
Support /keys/upload on /r0 as well as /unstable
-rw-r--r--synapse/app/frontend_proxy.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/app/frontend_proxy.py b/synapse/app/frontend_proxy.py
index bee4c47498..3f8c3feeb5 100644
--- a/synapse/app/frontend_proxy.py
+++ b/synapse/app/frontend_proxy.py
@@ -50,8 +50,7 @@ logger = logging.getLogger("synapse.app.frontend_proxy")
 
 
 class KeyUploadServlet(RestServlet):
-    PATTERNS = client_v2_patterns("/keys/upload(/(?P<device_id>[^/]+))?$",
-                                  releases=())
+    PATTERNS = client_v2_patterns("/keys/upload(/(?P<device_id>[^/]+))?$")
 
     def __init__(self, hs):
         """