diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-28 16:52:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-28 16:52:46 +0100 |
| commit | 54d0a755734f71e38c5cdc0e922422cc4d31ad74 (patch) | |
| tree | 4d0256be69f304553d0efaa71ec50498f3821683 /synapse/server.py | |
| parent | Up timeout to 10 minutes (diff) | |
| parent | Only send presence "poll"/"unpoll" EDUs when changing from/to zero remotes (diff) | |
| download | synapse-54d0a755734f71e38c5cdc0e922422cc4d31ad74.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into presence_logging
Conflicts: synapse/handlers/presence.py
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 5 |
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.""" |