diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-07-08 15:49:23 +0100 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-07-08 15:49:23 +0100 |
| commit | 57eacee4f4cff3a663a6e22834a82f9c5783a56d (patch) | |
| tree | b5714f78b8c129ad8aca1689e2d7ddecb20c3bed /synapse/handlers/events.py | |
| parent | Changelog (diff) | |
| parent | Update ModuleApi to avoid register(generate_token=True) (#5640) (diff) | |
| download | synapse-57eacee4f4cff3a663a6e22834a82f9c5783a56d.tar.xz | |
Merge branch 'develop' into babolivier/invite-json
Diffstat (limited to 'synapse/handlers/events.py')
| -rw-r--r-- | synapse/handlers/events.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/handlers/events.py b/synapse/handlers/events.py index 5836d3c639..6a38328af3 100644 --- a/synapse/handlers/events.py +++ b/synapse/handlers/events.py @@ -21,8 +21,8 @@ from twisted.internet import defer from synapse.api.constants import EventTypes, Membership from synapse.api.errors import AuthError, SynapseError from synapse.events import EventBase +from synapse.logging.utils import log_function from synapse.types import UserID -from synapse.util.logutils import log_function from synapse.visibility import filter_events_for_client from ._base import BaseHandler |