From: Mikael Nordfeldth <mmn@hethane.se>
Date: Tue, 2 Jun 2015 10:58:30 +0000 (+0200)
Subject: Accidentally presented Atom feed as ActivityStreams JSON
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2cebbead7552c6b93ea549c8ce37820b4e3ab689;p=quix0rs-gnu-social.git

Accidentally presented Atom feed as ActivityStreams JSON
---

diff --git a/actions/conversation.php b/actions/conversation.php
index 3b6f48c853..5a6e4b5c7a 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -128,7 +128,7 @@ class ConversationAction extends ManagedAction
                                                     'format' => 'atom')),
                               // TRANS: Title for link to notice feed.
                               // TRANS: %s is a user nickname.
-                              _('Conversation feed (Activity Streams JSON)')));
+                              _('Conversation feed (Atom)')));
     }
 }