summaryrefslogtreecommitdiffstats
path: root/templates/user_stats.html
diff options
context:
space:
mode:
authorBruno Sarlo <bruno@bruno-laptop.(none)>2009-08-08 21:44:10 -0300
committerBruno Sarlo <bruno@bruno-laptop.(none)>2009-08-08 21:44:10 -0300
commit0161159eb5b84d11908c16c6c86f93e1a8ac3c18 (patch)
tree871b0856af5e2dd5b816ee419857a38f80cd6b87 /templates/user_stats.html
parent0b80e6ba3fa528df2fc64a1a2e3a9f58dec39ec5 (diff)
parent46da3fdbe80ea1f6b9278d2671757d5fdb8abcfb (diff)
downloadaskbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.tar.gz
askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.tar.bz2
askbot-0161159eb5b84d11908c16c6c86f93e1a8ac3c18.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_stats.html')
-rw-r--r--templates/user_stats.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/user_stats.html b/templates/user_stats.html
index a5be1a77..432a5b34 100644
--- a/templates/user_stats.html
+++ b/templates/user_stats.html
@@ -1,5 +1,5 @@
-<!-- user_stats.html -->
{% extends "user.html" %}
+<!-- user_stats.html -->
{% load i18n %}
{% load extra_tags %}
{% load humanize %}