From: lain <lain@soykaf.club>
Date: Fri, 15 May 2020 14:37:38 +0000 (+0000)
Subject: Merge branch 'chore/update-fe-settings-and-docs' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=aeacfb24790326cd930e1c4ffea7505964dd5c69;hp=-c;p=akkoma

Merge branch 'chore/update-fe-settings-and-docs' into 'develop'

Synchronize PleromaFE settings

See merge request pleroma/pleroma!2532
---

aeacfb24790326cd930e1c4ffea7505964dd5c69