diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-06-12 16:52:52 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-06-12 16:52:52 -0500 |
| commit | 26f710b9e36d286ee34dd679fdaf99e39d8c0bf2 (patch) | |
| tree | 168a4f0522a19d424aaaefa0c85e63139c8fead2 /config/config.exs | |
| parent | a42d135cce3e6326cd8a16f08f4ab83633386c2e (diff) | |
| parent | e2793744c5dced3ced98acb21a2ef2b13ab65ac9 (diff) | |
| download | pleroma-26f710b9e36d286ee34dd679fdaf99e39d8c0bf2.tar.gz | |
Merge branch 'develop' into preload-data
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 6e75b79ec..32a92917c 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: [] |