summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorHubert Chathi <hubert@uhoreg.ca>2019-10-11 10:11:59 -0400
committerGitHub <noreply@github.com>2019-10-11 10:11:59 -0400
commit691dd67fcd0b376c1e5a5d9f2fe0f7efbf1cc7c9 (patch)
tree50dd0336df9ef58b46ed68dfa7d0827ef1a46b26 /synapse/rest
parentMerge pull request #6195 from matrix-org/erikj/opentracing_preview_url (diff)
parentchange test name to be unique (diff)
downloadsynapse-691dd67fcd0b376c1e5a5d9f2fe0f7efbf1cc7c9.tar.xz
Merge pull request #6189 from matrix-org/uhoreg/e2e_backup_optional_version
make version optional in body of e2e backup version update
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/room_keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/room_keys.py b/synapse/rest/client/v2_alpha/room_keys.py
index df4f44cd36..d596786430 100644
--- a/synapse/rest/client/v2_alpha/room_keys.py
+++ b/synapse/rest/client/v2_alpha/room_keys.py
@@ -375,7 +375,7 @@ class RoomKeysVersionServlet(RestServlet):
                     "ed25519:something": "hijklmnop"
                 }
             },
-            "version": "42"
+            "version": "12345"
         }
 
         HTTP/1.1 200 OK