diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:07:05 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-08-26 16:07:05 +0100 |
| commit | 4b63b06cad3e72e3d3dee66d3d6c7801e4a7abaf (patch) | |
| tree | 37b368d6039d986d70f153fb69d6345d1019d64a /synapse/handlers/_base.py | |
| parent | fix a few pyflakes errors (diff) | |
| parent | Fix pyflakes errors (diff) | |
| download | synapse-4b63b06cad3e72e3d3dee66d3d6c7801e4a7abaf.tar.xz | |
Merge branch 'develop' into storage_transactions
Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py
Diffstat (limited to 'synapse/handlers/_base.py')
| -rw-r--r-- | synapse/handlers/_base.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index c2f4685c92..3f07b5aa4a 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py @@ -24,4 +24,5 @@ class BaseHandler(object): self.notifier = hs.get_notifier() self.room_lock = hs.get_room_lock_manager() self.state_handler = hs.get_state_handler() + self.distributor = hs.get_distributor() self.hs = hs |