diff options
author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-16 08:50:53 +0200 |
---|---|---|
committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-09-16 08:50:53 +0200 |
commit | faee41c303c51f2d0ba9392643e67a8d100fbfa9 (patch) | |
tree | a586ca2ca460de50eb37c301409ccd97f9f40abf /synapse/handlers/room.py | |
parent | Filter room where the user has been banned (diff) | |
parent | Fix bug where we didn't always get 'prev_content' key (diff) | |
download | synapse-faee41c303c51f2d0ba9392643e67a8d100fbfa9.tar.xz |
Merge remote-tracking branch 'origin/develop' into webclient_data_centralisation
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 = { |