From: kaniini <nenolod@gmail.com>
Date: Fri, 31 Aug 2018 04:36:04 +0000 (+0000)
Subject: Merge branch 'update/pleroma-fe-20180831' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=03ecbe045605d04d7ceba2f3b5d16d620d97e8b2;p=akkoma

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

update pleroma frontend

See merge request pleroma/pleroma!311
---

03ecbe045605d04d7ceba2f3b5d16d620d97e8b2