diff options
| author | Erik Johnston <erikj@jki.re> | 2016-09-14 16:50:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-14 16:50:27 +0100 |
| commit | 21c88016bd489bd7843aafe544f961fdb98b1b5e (patch) | |
| tree | c17ff5888db7531e654c5c4c510b9b4e64b803ae /synapse/server.py | |
| parent | Merge pull request #1111 from matrix-org/matthew/device-ids (diff) | |
| parent | Enable testing of client_reader (diff) | |
| download | synapse-21c88016bd489bd7843aafe544f961fdb98b1b5e.tar.xz | |
Merge pull request #1118 from matrix-org/erikj/public_rooms_splitout
Split out public room list into a worker process
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/server.py b/synapse/server.py index f516f08167..69860f3d82 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -39,7 +39,7 @@ from synapse.handlers.devicemessage import DeviceMessageHandler from synapse.handlers.device import DeviceHandler from synapse.handlers.e2e_keys import E2eKeysHandler from synapse.handlers.presence import PresenceHandler -from synapse.handlers.room import RoomListHandler +from synapse.handlers.room_list import RoomListHandler from synapse.handlers.sync import SyncHandler from synapse.handlers.typing import TypingHandler from synapse.handlers.events import EventHandler, EventStreamHandler |