diff options
author | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-06 11:09:00 -0600 |
---|---|---|
committer | Adolfo Fitoria <fitoria@fitoria-laptop.(none)> | 2009-08-06 11:09:00 -0600 |
commit | 0b39716196977f9a368cfded6a1d05244ca724d0 (patch) | |
tree | fd1a31f04a866cab270a7c4ea846206782009823 /templates/answer_edit.html | |
parent | 02409029d958cced911b3b18e025cf495656cb04 (diff) | |
parent | 8d5ef067c8c4e7de276d559af67417f5324f9171 (diff) | |
download | askbot-0b39716196977f9a368cfded6a1d05244ca724d0.tar.gz askbot-0b39716196977f9a368cfded6a1d05244ca724d0.tar.bz2 askbot-0b39716196977f9a368cfded6a1d05244ca724d0.zip |
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master
Conflicts:
forum/auth.py
forum/models.py
forum/views.py
Diffstat (limited to 'templates/answer_edit.html')
-rw-r--r-- | templates/answer_edit.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/answer_edit.html b/templates/answer_edit.html index 008d9f78..9f0f1bec 100644 --- a/templates/answer_edit.html +++ b/templates/answer_edit.html @@ -1,5 +1,5 @@ -<!-- template answer_edit.html --> {% extends "base.html" %} +<!-- template answer_edit.html --> {% load i18n %} {% block title %}{% spaceless %}{% trans "Edit answer" %}{% endspaceless %}{% endblock %} {% block forejs %} |