We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 7d64d8c7 authored by Evan Prodromou's avatar Evan Prodromou

Merge commit 'refs/merge-requests/165' of...

Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline into merge-requests/165

Conflicts:
	lib/noticelist.php
parents 12588b1c 65bf58be
......@@ -603,6 +603,7 @@ class NoticeListItem extends Widget
// TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
$this->out->raw(_('Repeated by'));
$this->out->raw(_(' '));
$this->out->elementStart('a', $attrs);
$this->out->element('span', 'fn nickname', $repeater->nickname);
......
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 to comment