From: kaniini <nenolod@gmail.com>
Date: Mon, 20 Aug 2018 04:50:27 +0000 (+0000)
Subject: Merge branch 'update/pleroma-fe-20180820' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=e0c350db390f809a6cbd049a91ac819d740b4eda;p=akkoma

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

update pleroma frontend

See merge request pleroma/pleroma!277
---

e0c350db390f809a6cbd049a91ac819d740b4eda