diff options
| author | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-01 21:47:35 +0000 |
|---|---|---|
| committer | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-01 21:47:35 +0000 |
| commit | e4079abab8245c5b5a0987fbce9ab7cfd724f2d5 (patch) | |
| tree | 1292015df9e419521d1a2fe814ec3397f671320f /config/config.exs | |
| parent | 2e2f4587050da652fb0c4b8822d912301a8be273 (diff) | |
| parent | e2ce0e9e05ad09797f18b1a6adff4616704a48cc (diff) | |
| download | pleroma-e4079abab8245c5b5a0987fbce9ab7cfd724f2d5.tar.gz pleroma-e4079abab8245c5b5a0987fbce9ab7cfd724f2d5.zip | |
Merge branch 'feature/disable-config-management' into 'develop'
config: add ability to disable Pleroma FE config management (closes #276)
Closes #276
See merge request pleroma/pleroma!320
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index e22363519..b29300c3c 100644 --- a/config/config.exs +++ b/config/config.exs @@ -70,7 +70,8 @@ config :pleroma, :instance, allow_relay: true, rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, public: true, - quarantined_instances: [] + quarantined_instances: [], + managed_config: true config :pleroma, :fe, theme: "pleroma-dark", |