diff options
| author | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-08-20 15:11:02 -0400 |
|---|---|---|
| committer | tilly-Q <nattilypigeonfowl@gmail.com> | 2013-08-20 15:24:29 -0400 |
| commit | 2c901db023cd29d8f12408470245c9a5b8b911f1 (patch) | |
| tree | 658dcc580781c1bc09d67346f78f007305263ce6 /mediagoblin/auth | |
| parent | 9e204e49c9670b0e004dc9b62bf3b698b7534325 (diff) | |
| download | mediagoblin-2c901db023cd29d8f12408470245c9a5b8b911f1.tar.lz mediagoblin-2c901db023cd29d8f12408470245c9a5b8b911f1.tar.xz mediagoblin-2c901db023cd29d8f12408470245c9a5b8b911f1.zip | |
This commit was just to fix a few of the errors with the merging and to
make sure that all of the previous tests work fine.
Diffstat (limited to 'mediagoblin/auth')
| -rw-r--r-- | mediagoblin/auth/tools.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py index 596a4447..f758bca4 100644 --- a/mediagoblin/auth/tools.py +++ b/mediagoblin/auth/tools.py @@ -21,7 +21,7 @@ from sqlalchemy import or_ from mediagoblin import mg_globals from mediagoblin.tools.crypto import get_timed_signer_url -from mediagoblin.db.models import User +from mediagoblin.db.models import User, Privilege from mediagoblin.tools.mail import (normalize_email, send_email, email_debug_message) from mediagoblin.tools.template import render_template |