diff options
author | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-15 10:34:20 -0500 |
---|---|---|
committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2013-08-15 10:34:20 -0500 |
commit | 4834ef8ec21e985290f5e0015ae9452070956170 (patch) | |
tree | 365b6043f4a18a40a01d5aa13700ab98ee031613 /mediagoblin/plugins/oauth/tools.py | |
parent | 29cd702e4776811a96c3c088bd9ba8fc6f9176f0 (diff) | |
parent | 89909bd6921efb4ec3296c908c5d57eba35ebd21 (diff) | |
download | mediagoblin-4834ef8ec21e985290f5e0015ae9452070956170.tar.lz mediagoblin-4834ef8ec21e985290f5e0015ae9452070956170.tar.xz mediagoblin-4834ef8ec21e985290f5e0015ae9452070956170.zip |
Merge remote-tracking branch 'refs/remotes/tsyesika/master'
New oauth tools! Heck yeah!
Diffstat (limited to 'mediagoblin/plugins/oauth/tools.py')
-rw-r--r-- | mediagoblin/plugins/oauth/tools.py | 2 |
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): |