Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags...

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index 66aee3264a0fa0a305a6748ceba77d1b846d1369..23ada389b4fb8c0554bd1f65eec293abd4ff8685 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -654,6 +654,10 @@ config :pleroma, :oauth2,
 
 config :pleroma, :database, rum_enabled: false
 
+config :pleroma, :features, improved_hashtag_timeline: :auto
+
+config :pleroma, :populate_hashtags_table, fault_rate_allowance: 0.01
+
 config :pleroma, :env, Mix.env()
 
 config :http_signatures,