diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-07-19 11:26:04 +0100 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-07-19 11:26:04 +0100 |
| commit | be3adfc331ef7f19b2e44b17cd06e463bff09f3a (patch) | |
| tree | 2e565f68ef2154e3882704916eae3b1e8f0c9f3c /synapse/federation/units.py | |
| parent | Merge branch 'develop' into matthew/filter_members (diff) | |
| parent | revert 00bc979 (diff) | |
| download | synapse-be3adfc331ef7f19b2e44b17cd06e463bff09f3a.tar.xz | |
merge develop pydoc for _get_state_for_groups
Diffstat (limited to 'synapse/federation/units.py')
| -rw-r--r-- | synapse/federation/units.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py index 01c5b8fe17..bb1b3b13f7 100644 --- a/synapse/federation/units.py +++ b/synapse/federation/units.py @@ -17,10 +17,9 @@ server protocol. """ -from synapse.util.jsonobject import JsonEncodedObject - import logging +from synapse.util.jsonobject import JsonEncodedObject logger = logging.getLogger(__name__) |