diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-11-08 18:30:49 +0900 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-11-08 18:30:49 +0900 |
| commit | b14bf9044fd99fe31dd6aa987d9fc535e3bc0218 (patch) | |
| tree | 93b28dac59a093638427b31efdd8200fcb6e51bb /config | |
| parent | 7258db023e88d5aee5eac06525c42dcb073abd46 (diff) | |
| parent | 278674223d36f4d789dce92cd541c47b7e19b674 (diff) | |
| download | pleroma-b14bf9044fd99fe31dd6aa987d9fc535e3bc0218.tar.gz pleroma-b14bf9044fd99fe31dd6aa987d9fc535e3bc0218.zip | |
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 81d50cdee..787809b27 100644 --- a/config/config.exs +++ b/config/config.exs @@ -603,7 +603,7 @@ config :pleroma, :web_cache_ttl, activity_pub: nil, activity_pub_question: 30_000 -config :swarm, node_blacklist: [~r/myhtmlex_.*$/] +config :swarm, node_blacklist: [~r/myhtml_.*$/] # 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" |