summaryrefslogtreecommitdiffstats
path: root/templates/user_responses.html
diff options
context:
space:
mode:
authorBruno Sarlo <bruno@bruno-laptop.(none)>2009-08-08 21:43:46 -0300
committerBruno Sarlo <bruno@bruno-laptop.(none)>2009-08-08 21:43:46 -0300
commit9092721573a3443e0ab63da7883324684838c358 (patch)
tree871b0856af5e2dd5b816ee419857a38f80cd6b87 /templates/user_responses.html
parent57b1535b08e97f93529e0a8e1de16a538f3c4348 (diff)
parentaa8c379c31d251b0882213d34fbeb387d6ffa473 (diff)
downloadaskbot-9092721573a3443e0ab63da7883324684838c358.tar.gz
askbot-9092721573a3443e0ab63da7883324684838c358.tar.bz2
askbot-9092721573a3443e0ab63da7883324684838c358.zip
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG
* Merge of Spanish translation, still missing some texts. * Custom colors for preguntalo project Conflicts: locale/es/LC_MESSAGES/django.mo locale/es/LC_MESSAGES/django.po templates/content/style/style.css
Diffstat (limited to 'templates/user_responses.html')
-rw-r--r--templates/user_responses.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/user_responses.html b/templates/user_responses.html
index 45aab21b..d739395b 100644
--- a/templates/user_responses.html
+++ b/templates/user_responses.html
@@ -1,5 +1,5 @@
-<!-- user_responses.html -->
{% extends "user.html" %}
+<!-- user_responses.html -->
{% load extra_tags %}
{% load humanize %}