Merge branch 'update/pleroma-fe-config-20180831' into 'develop'
authorkaniini <nenolod@gmail.com>
Fri, 31 Aug 2018 04:06:18 +0000 (04:06 +0000)
committerkaniini <nenolod@gmail.com>
Fri, 31 Aug 2018 04:06:18 +0000 (04:06 +0000)
config: chase pleroma-fe updates from MR pleroma-fe!324.

See merge request pleroma/pleroma!310


Trivial merge