summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-12-19 10:24:26 +0000
committerRichard van der Hoff <richard@matrix.org>2018-12-19 10:24:26 +0000
commit4c238a9a914dd8d8f2c5013d9568d61f122ea792 (patch)
tree91567f9a0b42f89208ca763973ac57242cb73448 /synapse/storage
parentMerge tag 'v0.34.0rc1' into matrix-org-hotfixes (diff)
parentImproved welcome page (#4294) (diff)
downloadsynapse-4c238a9a914dd8d8f2c5013d9568d61f122ea792.tar.xz
Merge remote-tracking branch 'origin/release-v0.34.0' into matrix-org-hotfixes
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/e2e_room_keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/e2e_room_keys.py b/synapse/storage/e2e_room_keys.py

index 16b7f005aa..45cebe61d1 100644 --- a/synapse/storage/e2e_room_keys.py +++ b/synapse/storage/e2e_room_keys.py
@@ -182,7 +182,7 @@ class EndToEndRoomKeyStore(SQLBaseStore): keyvalues = { "user_id": user_id, - "version": version, + "version": int(version), } if room_id: keyvalues['room_id'] = room_id