diff options
| author | Mark Haines <mark.haines@matrix.org> | 2016-08-26 14:35:31 +0100 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2016-08-26 14:35:31 +0100 |
| commit | 4bbef62124f0fb249e314e94a1b9c15204c8daa9 (patch) | |
| tree | cc2e7458da160915f7224c0487f185e2433eaadb /synapse/rest | |
| parent | More 0_0 in tests (diff) | |
| parent | Merge pull request #1048 from matrix-org/erikj/fix_mail_name (diff) | |
| download | synapse-4bbef62124f0fb249e314e94a1b9c15204c8daa9.tar.xz | |
Merge remote-tracking branch 'origin/develop' into markjh/direct_to_device
Diffstat (limited to 'synapse/rest')
| -rw-r--r-- | synapse/rest/client/v2_alpha/thirdparty.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/thirdparty.py b/synapse/rest/client/v2_alpha/thirdparty.py index bbc3e9b962..4f6f1a7e17 100644 --- a/synapse/rest/client/v2_alpha/thirdparty.py +++ b/synapse/rest/client/v2_alpha/thirdparty.py @@ -18,8 +18,8 @@ import logging from twisted.internet import defer +from synapse.api.constants import ThirdPartyEntityKind from synapse.http.servlet import RestServlet -from synapse.types import ThirdPartyEntityKind from ._base import client_v2_patterns logger = logging.getLogger(__name__) |