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)
commit89fa14f5583b1465db1bad8c1fae2f7c436bf933
tree3ba92c4ed57e9fc35c7b6c7bf9fc85b2d7302caf
parente3534f5b3c68f9bf6a10c5fc10aa637ef66ab82e
parent960d6b54e8575b828d34fcf0b69e634dc4d33fe0
Merge branch 'fix/use-config-when-possible' into 'develop'

use Config in generated config when available

See merge request pleroma/pleroma!1319