diff options
author | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
---|---|---|
committer | Travis Ralston <travpc@gmail.com> | 2018-10-31 13:15:14 -0600 |
commit | d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e (patch) | |
tree | c832189c0f04fa02354feb419d72d6ad64b0e77f /synapse/storage/room.py | |
parent | pep8 (diff) | |
parent | Merge pull request #4101 from matrix-org/rav/aliases_for_upgrades (diff) | |
download | synapse-d1e7b9c44c127c8e9ddbbf4c45604a5482448b2e.tar.xz |
Merge branch 'develop' into travis/login-terms
Diffstat (limited to 'synapse/storage/room.py')
-rw-r--r-- | synapse/storage/room.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/room.py b/synapse/storage/room.py index 61013b8919..41c65e112a 100644 --- a/synapse/storage/room.py +++ b/synapse/storage/room.py @@ -47,7 +47,7 @@ class RoomWorkerStore(SQLBaseStore): Args: room_id (str): The ID of the room to retrieve. Returns: - A namedtuple containing the room information, or an empty list. + A dict containing the room information, or None if the room is unknown. """ return self._simple_select_one( table="rooms", |