diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-15 16:03:40 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-15 16:03:40 +0400 |
| commit | 58e4e3db8b04933129303d0ad9da74b43cbb4003 (patch) | |
| tree | 28cc28e116b8a8091e686ebc7a17f3c783d7ad04 /config/description.exs | |
| parent | 09d31d24de568aac06fe203beeb8bb2a9de8f602 (diff) | |
| parent | 448e93ce2c1eab9eb91118b90f661c31056e4781 (diff) | |
| download | pleroma-58e4e3db8b04933129303d0ad9da74b43cbb4003.tar.gz | |
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
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 3f69dac8a..b21d7840c 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1623,14 +1623,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"]} # ] # ] # }, |