From: rinpatch <rinpatch@sdf.org>
Date: Fri, 21 Jun 2019 22:43:39 +0000 (+0000)
Subject: Merge branch 'fix/use-config-when-possible' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=89fa14f5583b1465db1bad8c1fae2f7c436bf933;hp=--cc;p=akkoma

Merge branch 'fix/use-config-when-possible' into 'develop'

use Config in generated config when available

See merge request pleroma/pleroma!1319
---

89fa14f5583b1465db1bad8c1fae2f7c436bf933