summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-02-02 14:55:54 +0000
committerErik Johnston <erik@matrix.org>2017-02-02 14:55:54 +0000
commit6826593b8168d648b74a4d1c45ebe5aa66588d8e (patch)
tree249a34bc12f75884d00d6eb4e4fa9a3cc014b094 /synapse
parentUse stream_ordering_to_exterm for /keys/changes (diff)
downloadsynapse-6826593b8168d648b74a4d1c45ebe5aa66588d8e.tar.xz
sets aren't JSON serializable
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/client/v2_alpha/keys.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/keys.py b/synapse/rest/client/v2_alpha/keys.py
index f99b53530a..6a3cfe84f8 100644
--- a/synapse/rest/client/v2_alpha/keys.py
+++ b/synapse/rest/client/v2_alpha/keys.py
@@ -193,7 +193,7 @@ class KeyChangesServlet(RestServlet):
         )
 
         defer.returnValue((200, {
-            "changed": changed
+            "changed": list(changed),
         }))