diff options
author | Kegan Dougal <kegan@matrix.org> | 2014-09-15 15:27:58 +0100 |
---|---|---|
committer | Kegan Dougal <kegan@matrix.org> | 2014-09-15 15:27:58 +0100 |
commit | 14bc4ed59f0d98e80db96ed8232983f814082305 (patch) | |
tree | 27e70665764b41f5f16f8662eb1328e2ba20aba7 /synapse/rest/events.py | |
parent | Update spec to include m.login.email.identity (diff) | |
parent | Correctly handle the 'age' key in events and pdus (diff) | |
download | synapse-14bc4ed59f0d98e80db96ed8232983f814082305.tar.xz |
Merge branch 'develop' of github.com:matrix-org/synapse into registration-api-changes in preparation for re-merge to develop.
Diffstat (limited to 'synapse/rest/events.py')
-rw-r--r-- | synapse/rest/events.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/events.py b/synapse/rest/events.py index 7fde143200..097195d7cc 100644 --- a/synapse/rest/events.py +++ b/synapse/rest/events.py @@ -59,7 +59,7 @@ class EventRestServlet(RestServlet): event = yield handler.get_event(auth_user, event_id) if event: - defer.returnValue((200, event.get_dict())) + defer.returnValue((200, self.hs.serialize_event(event))) else: defer.returnValue((404, "Event not found.")) |