Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
authorRoger Braun <roger@rogerbraun.net>
Tue, 30 Jan 2018 11:20:39 +0000 (12:20 +0100)
committerRoger Braun <roger@rogerbraun.net>
Tue, 30 Jan 2018 11:20:39 +0000 (12:20 +0100)

Trivial merge