Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Garret Wassermann 2017-03-17 21:49:03 -04:00
commit 3fb701662e
3 changed files with 1423 additions and 940 deletions

File diff suppressed because it is too large Load Diff

View File

@ -22,7 +22,9 @@
<p>{{ item.question }}</p>
</div>
<div class="panel-footer">
<p>{% blocktrans %}View <a href='{{ item.get_absolute_url }}'>Answer <i class="fa fa-arrow-right"></i></a>{% endblocktrans %}</p>
<p>
{% blocktrans with item.get_absolute_url as url %}View <a href='{{ url }}'>Answer <i class="fa fa-arrow-right"></i></a>{% endblocktrans %}
</p>
<div class="well well-sm">
<p>{% trans 'Rating' %}: {{ item.score }}</p>
<p>{% trans 'Last Update' %}: {{ item.last_updated|naturaltime }}</p>