diff options
| author | lain <lain@soykaf.club> | 2020-09-17 13:26:04 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-09-17 13:26:04 +0200 |
| commit | 7a7385092885bd3c28497828d7b8da12e769ca83 (patch) | |
| tree | beee4c47c210cf4019d44e4c0b9a659c62436fe2 /config/description.exs | |
| parent | c4061f06ba26656a6a0e61f68c5f097930a4b054 (diff) | |
| parent | c5acbf8a1bd1a14ea82610cb3f69b8ebbb3ea28b (diff) | |
| download | pleroma-7a7385092885bd3c28497828d7b8da12e769ca83.tar.gz pleroma-7a7385092885bd3c28497828d7b8da12e769ca83.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
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", |