diff options
| author | Erik Johnston <erik@matrix.org> | 2017-02-02 15:23:45 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-02-02 15:23:45 +0000 |
| commit | 99fa03e8b55eee0d69f654ba61c3f31f9f6afde1 (patch) | |
| tree | 5eccc1feae37e9ba87085718a6340e1d0147ad2f /synapse/handlers/room.py | |
| parent | sets aren't JSON serializable (diff) | |
| parent | Merge pull request #1876 from matrix-org/erikj/shared_member_store (diff) | |
| download | synapse-99fa03e8b55eee0d69f654ba61c3f31f9f6afde1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/device_list_fixes
Diffstat (limited to 'synapse/handlers/room.py')
| -rw-r--r-- | synapse/handlers/room.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 5f18007e90..7e7671c9a2 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -437,6 +437,7 @@ class RoomEventSource(object): limit, room_ids, is_guest, + explicit_room_id=None, ): # We just ignore the key for now. |