diff options
| author | Mark Haines <mjark@negativecurvature.net> | 2016-03-08 18:11:10 +0000 |
|---|---|---|
| committer | Mark Haines <mjark@negativecurvature.net> | 2016-03-08 18:11:10 +0000 |
| commit | 5f5817ab05764603f9ca1b74261d9dd42fe55cfb (patch) | |
| tree | df763543528231bf10ce1b7925a55da5ba211820 /synapse/rest/client/v1/admin.py | |
| parent | Merge pull request #633 from matrix-org/daniel/ick (diff) | |
| parent | Fix relative imports so they work in both py3 and py27 (diff) | |
| download | synapse-5f5817ab05764603f9ca1b74261d9dd42fe55cfb.tar.xz | |
Merge pull request #632 from matrix-org/markjh/py3v2
Fix relative imports so they work in both py3 and py27
Diffstat (limited to 'synapse/rest/client/v1/admin.py')
| -rw-r--r-- | synapse/rest/client/v1/admin.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/admin.py b/synapse/rest/client/v1/admin.py index e2f5eb7b29..aa05b3f023 100644 --- a/synapse/rest/client/v1/admin.py +++ b/synapse/rest/client/v1/admin.py @@ -18,7 +18,7 @@ from twisted.internet import defer from synapse.api.errors import AuthError, SynapseError from synapse.types import UserID -from base import ClientV1RestServlet, client_path_patterns +from .base import ClientV1RestServlet, client_path_patterns import logging |