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/rest/client/v1/profile.py | |
| 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/rest/client/v1/profile.py')
| -rw-r--r-- | synapse/rest/client/v1/profile.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/profile.py b/synapse/rest/client/v1/profile.py index e4e3611a14..a23edd8fe5 100644 --- a/synapse/rest/client/v1/profile.py +++ b/synapse/rest/client/v1/profile.py @@ -16,9 +16,10 @@ """ This module contains REST servlets to do with profile: /profile/<paths> """ from twisted.internet import defer -from .base import ClientV1RestServlet, client_path_patterns -from synapse.types import UserID from synapse.http.servlet import parse_json_object_from_request +from synapse.types import UserID + +from .base import ClientV1RestServlet, client_path_patterns class ProfileDisplaynameRestServlet(ClientV1RestServlet): |