mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-24 02:25:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into daniel/roomcleanupincremental

Browse source 
Conflicts:
	synapse/handlers/room.py
This commit is contained in:
Daniel Wagner-Hall 2016-02-16 11:34:48 +00:00
commit feedaa37fa
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
synapse/handlers/room.py
View file

@ -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()