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/config.exs | |
| 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/config.exs')
| -rw-r--r-- | config/config.exs | 1 |
1 files changed, 0 insertions, 1 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", |