From: kaniini <nenolod@gmail.com>
Date: Sun, 18 Nov 2018 17:29:25 +0000 (+0000)
Subject: Merge branch 'update/pleroma-fe-20181118' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=fbc3f2893a3fa9177a73af15c36beb46eaa2707c;p=akkoma

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

update pleroma frontend

See merge request pleroma/pleroma!464
---

fbc3f2893a3fa9177a73af15c36beb46eaa2707c