summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-29 14:22:04 +0100
committerErik Johnston <erik@matrix.org>2014-08-29 14:22:04 +0100
commit8e2d4c6da55d2a21492f8610d595046f07d9887e (patch)
tree85ca2f67dd9552a3884d76d7d645adfb88e179e4 /synapse/server.py
parentCreate the correct events with the right configuration when creating a new room. (diff)
parentMerge branch 'release-v0.1.0' into develop (diff)
downloadsynapse-8e2d4c6da55d2a21492f8610d595046f07d9887e.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into room_config
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/synapse/server.py b/synapse/server.py
index ade8dc6c15..3e72b2bcd5 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -126,11 +126,6 @@ class BaseHomeServer(object):
         object."""
         return UserID.from_string(s, hs=self)
 
-    def parse_roomid(self, s):
-        """Parse the string given by 's' as a Room ID and return a RoomID
-        object."""
-        return RoomID.from_string(s, hs=self)
-
     def parse_roomalias(self, s):
         """Parse the string given by 's' as a Room Alias and return a RoomAlias
         object."""