summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDavid Baker <dave@matrix.org>2015-07-21 16:08:00 -0700
committerDavid Baker <dave@matrix.org>2015-07-21 16:08:00 -0700
commitcf7a40b08a381ee5715f915effd63dfe241a8d61 (patch)
treeec34acf22cf2055be373926fbcceba39e3124645 /synapse
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
downloadsynapse-cf7a40b08a381ee5715f915effd63dfe241a8d61.tar.xz
I think this was what was intended...
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/end_to_end_keys.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/storage/end_to_end_keys.py b/synapse/storage/end_to_end_keys.py
index 325740d7d0..69287c43df 100644
--- a/synapse/storage/end_to_end_keys.py
+++ b/synapse/storage/end_to_end_keys.py
@@ -52,6 +52,7 @@ class EndToEndKeyStore(SQLBaseStore):
                 )
                 for row in rows:
                     user_result[row["device_id"]] = row["key_json"]
+                result[user_id] = user_result
             return result
         return self.runInteraction("get_e2e_device_keys", _get_e2e_device_keys)