diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-09-17 14:54:00 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-09-17 14:54:00 +0300 |
| commit | 44e8b6037ae71881327451dcf7d9351f1ba82674 (patch) | |
| tree | d78e161239f819c3310248f3d1685bc481f0504c /config | |
| parent | c5830ac037c0c344bd22b674c41f4dc244a088aa (diff) | |
| parent | c5acbf8a1bd1a14ea82610cb3f69b8ebbb3ea28b (diff) | |
| download | pleroma-44e8b6037ae71881327451dcf7d9351f1ba82674.tar.gz pleroma-44e8b6037ae71881327451dcf7d9351f1ba82674.zip | |
Merge branch 'develop' into feature/expire-mutes
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/config/config.exs b/config/config.exs index c975da739..61255a5c5 100644 --- a/config/config.exs +++ b/config/config.exs @@ -216,7 +216,6 @@ config :pleroma, :instance, allow_relay: true, public: true, quarantined_instances: [], - managed_config: true, static_dir: "instance/static/", allowed_post_formats: [ "text/plain", 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", |