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)
commitd40466c291e54bcc31b2ea7ac772ba8229e9547b
treec71b6237b68905fe51d52fa0a3327de362b7411d
parenta26d5e6b2aba5010c699df659d63048957b347a5
parent856b5e1ca4d84e097cb78dbf34cf9861faa25e5e
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