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/server_notices | |
| 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/server_notices')
| -rw-r--r-- | synapse/server_notices/consent_server_notices.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/server_notices/consent_server_notices.py b/synapse/server_notices/consent_server_notices.py index bb74af1af5..5e3044d164 100644 --- a/synapse/server_notices/consent_server_notices.py +++ b/synapse/server_notices/consent_server_notices.py @@ -14,7 +14,8 @@ # limitations under the License. import logging -from six import (iteritems, string_types) +from six import iteritems, string_types + from twisted.internet import defer from synapse.api.errors import SynapseError |