diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 20:24:30 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-12-12 20:24:30 -0500 |
| commit | f9ae4f860ccf57e84032d7be9426331a9e06e979 (patch) | |
| tree | c9d837d7e2750d22ba9049abc7cf3c4125f0c9e4 /devel/management | |
| parent | 6c5c3355a97d35afb7f1eee284966ad0bf8cee3b (diff) | |
| parent | 206000df736fde75a49c3178a8522d17f30a955e (diff) | |
Merge tag 'release_2012-04-21'
Migrations, moving code around, random small improvements
Diffstat (limited to 'devel/management')
| -rw-r--r-- | devel/management/commands/generate_keyring.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/devel/management/commands/generate_keyring.py b/devel/management/commands/generate_keyring.py index 062c738b..b9117c84 100644 --- a/devel/management/commands/generate_keyring.py +++ b/devel/management/commands/generate_keyring.py @@ -13,8 +13,7 @@ import logging import subprocess import sys -from devel.models import MasterKey -from main.models import UserProfile +from devel.models import MasterKey, UserProfile logging.basicConfig( level=logging.INFO, |