From: Roger Braun Date: Tue, 30 Jan 2018 11:20:39 +0000 (+0100) Subject: Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ad0ab3a57bc5591806cae0201d8077ffb10b6634;p=akkoma Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop --- ad0ab3a57bc5591806cae0201d8077ffb10b6634