Commit 396dfcd3 by Őry Máté

Merge branch 'master' into feature-mass-ops

Conflicts:
	circle/dashboard/templates/dashboard/_notifications-timeline.html
parents a340b19b aea321fc
......@@ -3,7 +3,7 @@
{% for n in notifications %}
<li class="notification-message" id="msg-{{n.id}}">
<span class="notification-message-subject">
{% if n.status == "new" %}<i class="fa fa-envelope-alt"></i> {% endif %}
{% if n.status == "new" %}<i class="fa fa-envelope-o"></i> {% endif %}
{{ n.subject|get_text:user }}
</span>
<span class="notification-message-date pull-right" title="{{n.created}}">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment