Merge branch 'fix/use-config-when-possible' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Fri, 21 Jun 2019 22:43:39 +0000 (22:43 +0000)
committerrinpatch <rinpatch@sdf.org>
Fri, 21 Jun 2019 22:43:39 +0000 (22:43 +0000)
use Config in generated config when available

See merge request pleroma/pleroma!1319


Trivial merge