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/handlers/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/handlers/room.py')
-rw-r--r-- | synapse/handlers/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 310cb46fe7..5bc1280432 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -335,7 +335,7 @@ class RoomMemberHandler(BaseHandler): member_list = yield self.store.get_room_members(room_id=room_id) event_list = [ - entry.get_dict() + self.hs.serialize_event(entry) for entry in member_list ] chunk_data = { |