diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:15:58 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-27 17:15:58 +0100 |
| commit | 2aeaa7b77c0c39f12c89b0054049970faad28406 (patch) | |
| tree | f3022ab73ea75827dfec17de532fb07b0949196f /synapse/rest/room.py | |
| parent | Return the store_id from persist_event (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-2aeaa7b77c0c39f12c89b0054049970faad28406.tar.xz | |
Merge branch 'develop' into storage_transactions
Conflicts: synapse/handlers/room.py synapse/storage/stream.py
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 ebe4e24432..a10b3b54f9 100644 --- a/synapse/rest/room.py +++ b/synapse/rest/room.py @@ -18,9 +18,9 @@ from twisted.internet import defer from base import RestServlet, client_path_pattern from synapse.api.errors import SynapseError, Codes +from synapse.streams.config import PaginationConfig from synapse.api.events.room import RoomMemberEvent from synapse.api.constants import Membership -from synapse.api.streams import PaginationConfig import json import logging |