diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-03 11:06:29 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-03 11:06:29 +0000 |
| commit | 6f52e90065243682d93e5f89b071e1fb056fa6ab (patch) | |
| tree | 98b9c43dd42dbc3d14a96f1b81e0631c7ac271c9 /synapse/handlers/directory.py | |
| parent | Unused import (diff) | |
| parent | Merge pull request #553 from matrix-org/daniel/accesstokenlogging (diff) | |
| download | synapse-6f52e90065243682d93e5f89b071e1fb056fa6ab.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/public_room_fix
Diffstat (limited to 'synapse/handlers/directory.py')
| -rw-r--r-- | synapse/handlers/directory.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py index 691564c651..4efecb1ffd 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -175,8 +175,8 @@ class DirectoryHandler(BaseHandler): # If this server is in the list of servers, return it first. if self.server_name in servers: servers = ( - [self.server_name] - + [s for s in servers if s != self.server_name] + [self.server_name] + + [s for s in servers if s != self.server_name] ) else: servers = list(servers) |