Merge branch 'master' into nightly

Some merge requests that were aimed at master
This commit is contained in:
Mikael Nordfeldth
2015-11-05 16:07:05 +01:00
6 changed files with 13 additions and 10 deletions

View File

@@ -199,7 +199,7 @@ class SharePlugin extends ActivityVerbHandlerPlugin
'class' => 'h-card p-author',
'title' => $repeater->getFancyName());
$nli->out->elementStart('span', 'repeat h-entry');
$nli->out->elementStart('span', 'repeat');
// TRANS: Addition in notice list item if notice was repeated. Followed by a span with a nickname.
$nli->out->raw(_('Repeated by').' ');