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

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

update pleroma frontend

See merge request pleroma/pleroma!279
---

7266cc67ffa46564c26e4aa2924ed53f3d886ff2