diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-09-15 20:29:39 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-09-15 20:29:39 +0300 |
| commit | 2f155fb89f7175ac95e188bfd8896848d5332d18 (patch) | |
| tree | 5f04268d0189b6961c53904b027846cbe4281ae5 /config | |
| parent | cd234a5321b9d33146b90be95d84fa67aa4f7707 (diff) | |
| parent | cfad4f46b2d53f67722f7b8046b673d60a9cefcd (diff) | |
| download | pleroma-2f155fb89f7175ac95e188bfd8896848d5332d18.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
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 93c930937..2ca2236a9 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 c8e709730..79e3cc259 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", |