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)
commitad0ab3a57bc5591806cae0201d8077ffb10b6634
tree97a935b5bd612b0c944285ec03c1438fa2344401
parentede4883ac93b1827c8fab125125bff94c1a855db
parent450109460674d914171bd1a1516a2c5faf355a7c
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop