diff --git a/Changelog.md b/Changelog.md index c687851971b121cccd93322342c38ef0bfa7be4c..cd58b1ba8e94a0ced823568eaec633ac4a12a8c6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -20,6 +20,7 @@ * Fix code reloading for PostPresenter [#5888](https://github.com/diaspora/diaspora/pull/5888) * Fix closing account from mobile view [#5913](https://github.com/diaspora/diaspora/pull/5913) * Allow using common custom template for desktop & mobile landing page [#5915](https://github.com/diaspora/diaspora/pull/5915) +* Use correct branding in Atom feed [#5929](https://github.com/diaspora/diaspora/pull/5929) ## Features * Hide post title of limited post in comment notification email [#5843](https://github.com/diaspora/diaspora/pull/5843) diff --git a/app/views/users/public.atom.builder b/app/views/users/public.atom.builder index 8dfd609d1f82884dfb8da87e8b04e34bdda541f2..c2720ceb6c8dcbbf37feddde240d368c770db872 100644 --- a/app/views/users/public.atom.builder +++ b/app/views/users/public.atom.builder @@ -10,7 +10,7 @@ atom_feed({'xmlns:thr' => 'http://purl.org/syndication/thread/1.0', feed.tag! :generator, 'Diaspora', :uri => "#{AppConfig.pod_uri.to_s}" feed.title "#{@user.name}'s Public Feed" - feed.subtitle "Updates from #{@user.name} on Diaspora" + feed.subtitle "Updates from #{@user.name} on diaspora*" feed.logo "#{@user.image_url(:thumb_small)}" feed.updated @posts[0].created_at if @posts.length > 0 feed.tag! :link, :rel => 'avatar', :type => 'image/jpeg', 'media:width' => '100',