diff options
| author | Erik Johnston <erik@matrix.org> | 2019-07-05 14:08:21 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2019-07-05 14:08:21 +0100 |
| commit | 7f0d8e42885078583d1eab16df2523292ed1148d (patch) | |
| tree | 97d56ee3dd35549820a69b702d574d1704560773 /synapse/handlers/events.py | |
| parent | Assume key existence. Update docstrings (diff) | |
| parent | remove dead transaction persist code (#5622) (diff) | |
| download | synapse-7f0d8e42885078583d1eab16df2523292ed1148d.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/admin_exfiltrate_data
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 |