From: kaniini <nenolod@gmail.com>
Date: Fri, 24 Aug 2018 22:00:13 +0000 (+0000)
Subject: Merge branch 'update/pleroma-fe-20180824' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=66bc37925e8896d156bbbb4a89a73cf8d9c88d56;p=akkoma

Merge branch 'update/pleroma-fe-20180824' into 'develop'

update pleroma frontend

See merge request pleroma/pleroma!292
---

66bc37925e8896d156bbbb4a89a73cf8d9c88d56