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/room.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/room.py')
| -rw-r--r-- | synapse/rest/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py index cef700c81c..ecb1e346d9 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -378,7 +378,7 @@ class RoomTriggerBackfill(RestServlet): handler = self.handlers.federation_handler events = yield handler.backfill(remote_server, room_id, limit) - res = [event.get_dict() for event in events] + res = [self.hs.serialize_event(event) for event in events] defer.returnValue((200, res)) |