Merge branch 'fix/dynamic-configuration' into 'develop'
authorlain <lain@soykaf.club>
Thu, 20 Jun 2019 17:43:57 +0000 (17:43 +0000)
committerlain <lain@soykaf.club>
Thu, 20 Jun 2019 17:43:57 +0000 (17:43 +0000)
commit3b48876cf02b35af953bf463987e42675a9e6180
tree584217291832436738724043ee8f52e1eae6d9fa
parentba584364e905531417dae2e07675dbbf60c3a007
parent32320c1ee94a999082f10c9f9a3c6d55ced21e21
Merge branch 'fix/dynamic-configuration' into 'develop'

Fixes for dynamic configuration

See merge request pleroma/pleroma!1313