diff options
| author | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-16 11:34:48 +0000 |
|---|---|---|
| committer | Daniel Wagner-Hall <daniel@matrix.org> | 2016-02-16 11:34:48 +0000 |
| commit | feedaa37fa5a4522f7929cddf8fff0b30015a476 (patch) | |
| tree | e94a84f912f109d57d598335159358d2e982ab62 | |
| parent | Branch off member and non member sends (diff) | |
| parent | Merge pull request #577 from matrix-org/daniel/createroom (diff) | |
| download | synapse-feedaa37fa5a4522f7929cddf8fff0b30015a476.tar.xz | |
Merge branch 'develop' into daniel/roomcleanupincremental
Conflicts: synapse/handlers/room.py
| -rw-r--r-- | synapse/handlers/room.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 5d4e87b3b0..722dadde77 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -80,13 +80,13 @@ class RoomCreationHandler(BaseHandler): """ Creates a new room. Args: - user_id (str): The ID of the user creating the new room. + requester (Requester): The user who requested the room creation. config (dict) : A dict of configuration options. Returns: The new room ID. Raises: - SynapseError if the room ID was taken, couldn't be stored, or - something went horribly wrong. + SynapseError if the room ID couldn't be stored, or something went + horribly wrong. """ user_id = requester.user.to_string() |