From: kaniini <nenolod@gmail.com>
Date: Sat, 18 Aug 2018 18:24:33 +0000 (+0000)
Subject: Merge branch 'update/pleroma-fe-20180818' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b46156be92ecfd9d0e29f0b9021757a15126b2d8;p=akkoma

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

update pleroma frontend

See merge request pleroma/pleroma!276
---

b46156be92ecfd9d0e29f0b9021757a15126b2d8