summary refs log tree commit diff
path: root/synapse/visibility.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-07-10 18:04:03 +0100
committerRichard van der Hoff <richard@matrix.org>2018-07-10 18:04:03 +0100
commitf04e35c17001171df58ace4fed63772d8101d7fc (patch)
tree11424fdd20122c014262283d4401c84ffbcd9978 /synapse/visibility.py
parentMerge branch 'develop' of git+ssh://github.com/matrix-org/synapse into matrix... (diff)
parents/becuase/because/g (diff)
downloadsynapse-f04e35c17001171df58ace4fed63772d8101d7fc.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/visibility.py')
-rw-r--r--synapse/visibility.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/synapse/visibility.py b/synapse/visibility.py

index 65d79cf0d0..015c2bab37 100644 --- a/synapse/visibility.py +++ b/synapse/visibility.py
@@ -20,9 +20,7 @@ from twisted.internet import defer from synapse.api.constants import EventTypes, Membership from synapse.events.utils import prune_event -from synapse.util.logcontext import ( - make_deferred_yieldable, preserve_fn, -) +from synapse.util.logcontext import make_deferred_yieldable, preserve_fn logger = logging.getLogger(__name__)