From: kaniini <nenolod@gmail.com>
Date: Sun, 9 Sep 2018 12:15:14 +0000 (+0000)
Subject: Merge branch 'update/pleroma-fe-20180909' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=f55ffc78938a932da9940c34a83bd56e3386f983;p=akkoma

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

update pleroma frontend

See merge request pleroma/pleroma!335
---

f55ffc78938a932da9940c34a83bd56e3386f983