diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-27 16:11:43 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-27 16:11:43 +0100 |
| commit | 89c044c2a0727c73cce4e6bff9a25a87da6f52bd (patch) | |
| tree | 22d342f5beae7218c4f3664db8a888ddbafc4dab /synapse/rest/room.py | |
| parent | api docs: Finished adding all C-S APIs. Added initialSync, publicRooms, membe... (diff) | |
| parent | Turn off presence again. (diff) | |
| download | synapse-89c044c2a0727c73cce4e6bff9a25a87da6f52bd.tar.xz | |
Merge branch 'stream_refactor' into 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 3f2530b141..66efaa76f0 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 |