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/description.exs | |
| parent | a42d135cce3e6326cd8a16f08f4ab83633386c2e (diff) | |
| parent | e2793744c5dced3ced98acb21a2ef2b13ab65ac9 (diff) | |
| download | pleroma-26f710b9e36d286ee34dd679fdaf99e39d8c0bf2.tar.gz pleroma-26f710b9e36d286ee34dd679fdaf99e39d8c0bf2.zip | |
Merge branch 'develop' into preload-data
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs index 807c945e0..add1601e2 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1473,6 +1473,21 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, + key: :mrf_activity_expiration, + label: "MRF Activity Expiration Policy", + type: :group, + description: "Adds expiration to all local Create Note activities", + children: [ + %{ + key: :days, + type: :integer, + description: "Default global expiration time for all local Create activities (in days)", + suggestions: [90, 365] + } + ] + }, + %{ + group: :pleroma, key: :mrf_subchain, label: "MRF subchain", type: :group, |