diff options
| author | Jeroen <vo.jeroen@gmail.com> | 2018-07-14 20:24:46 +0200 |
|---|---|---|
| committer | Jeroen <vo.jeroen@gmail.com> | 2018-07-14 20:24:46 +0200 |
| commit | 505530f36abba53234c2fa29262a0de87face4fb (patch) | |
| tree | 313bbefb0f7b9693f1189a86410fe3dcdb9207f7 /synapse/server_notices | |
| parent | Merge branch 'develop' into send_sni_for_federation_requests (diff) | |
| parent | Fix develop because I broke it :( (#3535) (diff) | |
| download | synapse-505530f36abba53234c2fa29262a0de87face4fb.tar.xz | |
Merge remote-tracking branch 'upstream/develop' into send_sni_for_federation_requests
# Conflicts: # synapse/crypto/context_factory.py
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 |