diff options
author | Paul Evans <leonerd@leonerd.org.uk> | 2016-08-25 18:49:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-25 18:49:18 +0100 |
commit | 1a1e198f72a1ce0124ee0060be5b27cb8c6d5e5a (patch) | |
tree | 3f78b4a5870743e84c984446231546011da0927c /synapse/rest/client/v2_alpha/thirdparty.py | |
parent | Merge pull request #1041 from matrix-org/paul/third-party-lookup (diff) | |
parent | Just sprintf the 'kind' argument into uri directly (diff) | |
download | synapse-1a1e198f72a1ce0124ee0060be5b27cb8c6d5e5a.tar.xz |
Merge pull request #1044 from matrix-org/paul/third-party-lookup
Root the 3PE lookup API within /_matrix/app/unstable
Diffstat (limited to 'synapse/rest/client/v2_alpha/thirdparty.py')
-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__) |