diff options
| author | NoahY <yuttadhammo@yahoo.com> | 2011-07-26 23:14:07 +0530 |
|---|---|---|
| committer | NoahY <yuttadhammo@yahoo.com> | 2011-07-26 23:14:07 +0530 |
| commit | f20910217d645bc922cbdfce774c84ce5a7dc130 (patch) | |
| tree | 6d107e92fcda60db7595144343d4cc31636275b0 | |
| parent | ff29d6d0e737b280d14dbc929991832405a0863d (diff) | |
| parent | 99247f9178972ee7a0835473972ce0019be4b499 (diff) | |
| download | askbot-f20910217d645bc922cbdfce774c84ce5a7dc130.tar.gz askbot-f20910217d645bc922cbdfce774c84ce5a7dc130.tar.bz2 askbot-f20910217d645bc922cbdfce774c84ce5a7dc130.zip | |
Merge branch 'master' into cloud
| -rw-r--r-- | askbot/views/meta.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/askbot/views/meta.py b/askbot/views/meta.py index 0ca1e591..301a0925 100644 --- a/askbot/views/meta.py +++ b/askbot/views/meta.py @@ -17,7 +17,7 @@ from askbot.utils.forms import get_next_url from askbot.utils.mail import mail_moderators from askbot.models import BadgeData, Award, User from askbot.models import badges as badge_data -from askbot.skins.loaders import get_template, render_into_skin, render_text +from askbot.skins.loaders import get_template, render_into_skin, render_text_into_skin from askbot.conf import settings as askbot_settings from askbot import skins |