summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2017-10-26 18:13:21 +0100
committerRichard van der Hoff <richard@matrix.org>2017-10-26 18:18:23 +0100
commit0a5866bec9a06eaed11201ad4506b09f5cd73310 (patch)
tree2e39631560e3bec24a194fa99b790b92f5249c50
parentMerge pull request #2579 from krombel/move_unstable_to_r0 (diff)
downloadsynapse-0a5866bec9a06eaed11201ad4506b09f5cd73310.tar.xz
Support /keys/upload on /r0 as well as /unstable
(So that we can stop riot relying on it in /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):
         """