diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-12 18:25:29 +0400 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-12 18:25:29 +0400 |
commit | 697cf920249b4f67bcc49aa923374d5fdc20809b (patch) | |
tree | ee8630240ae99d32279c6a66aea0a51e2b3f406c /config/config.exs | |
parent | 2419776e192316cefbdbe607306c9b92ec558319 (diff) | |
parent | e557265a037caa0fd4ab35c811d19ad07a5f53fa (diff) | |
download | pleroma-697cf920249b4f67bcc49aa923374d5fdc20809b.tar.gz |
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
Diffstat (limited to 'config/config.exs')
-rw-r--r-- | config/config.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs index cafa40820..6a7bb9e06 100644 --- a/config/config.exs +++ b/config/config.exs @@ -371,6 +371,8 @@ config :pleroma, :mrf_keyword, config :pleroma, :mrf_subchain, match_actor: %{} +config :pleroma, :mrf_activity_expiration, days: 365 + config :pleroma, :mrf_vocabulary, accept: [], reject: [] |