aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/plugins/oauth/tools.py
diff options
context:
space:
mode:
authorAditi <aditi.iitr@gmail.com>2013-08-22 22:34:06 +0530
committerAditi <aditi.iitr@gmail.com>2013-08-22 22:34:06 +0530
commit70cc6eb8f383dcc97aeac22216a9da0d65a09085 (patch)
tree7f9d646002f2e6db763b1b3e89d9762efb12a544 /mediagoblin/plugins/oauth/tools.py
parente018b2120ac4131afab6611c84f8cfbe0926e640 (diff)
parente7b8059f17c98ee88d933af52b0c4d858e882e8e (diff)
downloadmediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.tar.lz
mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.tar.xz
mediagoblin-70cc6eb8f383dcc97aeac22216a9da0d65a09085.zip
Resolve merge conflict and merge.
Diffstat (limited to 'mediagoblin/plugins/oauth/tools.py')
-rw-r--r--mediagoblin/plugins/oauth/tools.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/plugins/oauth/tools.py b/mediagoblin/plugins/oauth/tools.py
index 27ff32b4..af0a3305 100644
--- a/mediagoblin/plugins/oauth/tools.py
+++ b/mediagoblin/plugins/oauth/tools.py
@@ -23,7 +23,7 @@ from datetime import datetime
from functools import wraps
-from mediagoblin.plugins.api.tools import json_response
+from mediagoblin.tools.response import json_response
def require_client_auth(controller):