diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-11-05 11:36:47 +1000 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-11-05 11:36:47 +1000 |
| commit | 2cbfa256fd911b66a28c78008d1d622bfdb5d345 (patch) | |
| tree | fb4217abd5bd1edc85f61e1b37858da1c35cd098 /config | |
| parent | ab5c8ec9fac8045cd5a3f25526f302bc9249e1bf (diff) | |
| parent | fee127696308dbec9cff6b2a9b399cf2877cf445 (diff) | |
| download | pleroma-2cbfa256fd911b66a28c78008d1d622bfdb5d345.tar.gz pleroma-2cbfa256fd911b66a28c78008d1d622bfdb5d345.zip | |
Merge branch 'develop' into feature/multiple-users-force-password-reset
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index a69d41d17..81d50cdee 100644 --- a/config/config.exs +++ b/config/config.exs @@ -284,8 +284,8 @@ config :pleroma, :markup, allow_tables: false, allow_fonts: false, scrub_policy: [ - Pleroma.HTML.Transform.MediaProxy, - Pleroma.HTML.Scrubber.Default + Pleroma.HTML.Scrubber.Default, + Pleroma.HTML.Transform.MediaProxy ] config :pleroma, :frontend_configurations, @@ -603,6 +603,7 @@ config :pleroma, :web_cache_ttl, activity_pub: nil, activity_pub_question: 30_000 +config :swarm, node_blacklist: [~r/myhtmlex_.*$/] # Import environment specific config. This must remain at the bottom # of this file so it overrides the configuration defined above. import_config "#{Mix.env()}.exs" |