From: kaniini <nenolod@gmail.com>
Date: Thu, 25 Oct 2018 00:16:15 +0000 (+0000)
Subject: Merge branch 'update-pleroma-frontend' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=4b2a586942edd5510e1835d57149387292052523;p=akkoma

Merge branch 'update-pleroma-frontend' into 'develop'

Update pleroma frontend

See merge request pleroma/pleroma!385
---

4b2a586942edd5510e1835d57149387292052523