diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-05 15:43:52 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-05 15:43:52 +0000 |
| commit | 729ea933ea4a02430002d5055483c3ea34538578 (patch) | |
| tree | 2064ec885655d444c4d155b1132f845176b36ec4 /synapse/handlers/federation.py | |
| parent | Implement basic pagination for search results (diff) | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-729ea933ea4a02430002d5055483c3ea34538578.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/search
Diffstat (limited to 'synapse/handlers/federation.py')
| -rw-r--r-- | synapse/handlers/federation.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index ae9d227586..b2395b28d1 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -72,8 +72,6 @@ class FederationHandler(BaseHandler): self.server_name = hs.hostname self.keyring = hs.get_keyring() - self.lock_manager = hs.get_room_lock_manager() - self.replication_layer.set_handler(self) # When joining a room we need to queue any events for that room up |