diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-14 15:19:09 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-14 15:19:09 +0000 |
| commit | 39d769f25057dbaf89dc23d39941780bc65c2b06 (patch) | |
| tree | 3f97dd0896244b88d337921a374a6df60fd76831 /config/description.exs | |
| parent | 6e70415e4a1d814d2b772d94658d9f7b66d1fe89 (diff) | |
| parent | 0b5e72ecf033ff78c67eb4e5a68277e5d83f5611 (diff) | |
| download | pleroma-39d769f25057dbaf89dc23d39941780bc65c2b06.tar.gz pleroma-39d769f25057dbaf89dc23d39941780bc65c2b06.zip | |
Merge branch 'remove/managed-config-option' into 'develop'
Remove `:managed_config` option.
Closes #2086
See merge request pleroma/pleroma!2983
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/config/description.exs b/config/description.exs index 82c7bc6a7..2b30f8148 100644 --- a/config/description.exs +++ b/config/description.exs @@ -765,12 +765,6 @@ config :pleroma, :config_description, [ ] }, %{ - key: :managed_config, - type: :boolean, - description: - "Whenether the config for pleroma-fe is configured in this config or in static/config.json" - }, - %{ key: :static_dir, type: :string, description: "Instance static directory", |