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

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

config: chase pleroma-fe updates from MR pleroma-fe!324.

See merge request pleroma/pleroma!310
---

d40466c291e54bcc31b2ea7ac772ba8229e9547b