diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-06-13 09:07:02 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-06-13 09:07:02 +0000 |
| commit | f891e2b2f1d1daa122b9856e4b660be394d31e34 (patch) | |
| tree | ed57c9e3ebf43d80a17a399baa54b01cd1c85eb9 /config/description.exs | |
| parent | 6c90fc8e70760bf8c58bb731ce294e9eee02f430 (diff) | |
| parent | d050d21103d09fa62bd1ff1b6755c62980de3517 (diff) | |
Merge branch 'release/2.0.7' into 'stable'v2.0.7
Release/2.0.7
See merge request pleroma/secteam/pleroma!8
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/config/description.exs b/config/description.exs index 2623e3683..37cb548ff 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1483,14 +1483,12 @@ config :pleroma, :config_description, [ # %{ # group: :pleroma, # key: :mrf_user_allowlist, - # type: :group, + # type: :map, # description: # "The keys in this section are the domain names that the policy should apply to." <> # " Each key should be assigned a list of users that should be allowed through by their ActivityPub ID", - # children: [ - # ["example.org": ["https://example.org/users/admin"]], # suggestions: [ - # ["example.org": ["https://example.org/users/admin"]] + # %{"example.org" => ["https://example.org/users/admin"]} # ] # ] # }, |