summaryrefslogtreecommitdiffstats
path: root/templates/user_info.html
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-06 11:09:00 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-06 11:09:00 -0600
commit0b39716196977f9a368cfded6a1d05244ca724d0 (patch)
treefd1a31f04a866cab270a7c4ea846206782009823 /templates/user_info.html
parent02409029d958cced911b3b18e025cf495656cb04 (diff)
parent8d5ef067c8c4e7de276d559af67417f5324f9171 (diff)
downloadaskbot-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/user_info.html')
-rw-r--r--templates/user_info.html2
1 files changed, 2 insertions, 0 deletions
diff --git a/templates/user_info.html b/templates/user_info.html
index 8e6dca84..8d35015c 100644
--- a/templates/user_info.html
+++ b/templates/user_info.html
@@ -70,12 +70,14 @@
<td>{% get_age view_user.date_of_birth %} {% trans "age unit" %}</td>
</tr>
{% endif %}
+ <!--
{% if votes_today_left %}
<tr>
<td>{% trans "todays unused votes" %}</td>
<td><strong class="darkred">{{ votes_today_left }}</strong> {% trans "votes left" %}</td>
</tr>
{% endif %}
+ -->
</table>
</td>
<td width="380">