diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-08-29 09:33:52 -0600 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-08-29 09:33:52 -0600 |
| commit | d17fdef408bda08afe04362b1b2ef31ba3d4b664 (patch) | |
| tree | ce49dd450e97a89626982bf12871a2691338255c /askbot/views/users.py | |
| parent | f39380e089ac30845589756f44b49e4e059fcf78 (diff) | |
| download | askbot-d17fdef408bda08afe04362b1b2ef31ba3d4b664.tar.gz askbot-d17fdef408bda08afe04362b1b2ef31ba3d4b664.tar.bz2 askbot-d17fdef408bda08afe04362b1b2ef31ba3d4b664.zip | |
Revert "Added models/group.py to start migrationg the new Group model from Tag"
This reverts commit 1975772d504efa3aab494b49f1d0c1176225ba5c.
Conflicts:
askbot/models/post.py
askbot/models/tag.py
askbot/tests/db_api_tests.py
askbot/views/users.py
Diffstat (limited to 'askbot/views/users.py')
| -rw-r--r-- | askbot/views/users.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/askbot/views/users.py b/askbot/views/users.py index 6a335d2f..d76712e6 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -37,8 +37,8 @@ from askbot.conf import settings as askbot_settings from askbot import models from askbot import exceptions from askbot.models.badges import award_badges_signal -from askbot.models.group import get_global_group, get_groups -from askbot.models.group import get_group_manager +from askbot.models.tag import get_global_group +from askbot.models.tag import get_groups from askbot.skins.loaders import render_into_skin from askbot.search.state_manager import SearchState from askbot.utils import url_utils |