Merge branch 'client_v2_filter' into client_v2_sync

This commit is contained in:
Mark Haines 2015-01-29 18:04:07 +00:00
commit 7ceda8bf3d
3 changed files with 166 additions and 164 deletions

View file

@ -59,7 +59,7 @@ class GetFilterRestServlet(RestServlet):
filter_id=filter_id,
)
defer.returnValue((200, filter))
defer.returnValue((200, filter.filter_json))
except KeyError:
raise SynapseError(400, "No such filter")