diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-09 09:08:59 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-09 09:08:59 -0500 |
| commit | 49c4e2495357797caa82b4eb0a4d03e8c8dd2730 (patch) | |
| tree | 7295ba98c7833534622a9c7fb27580691fbc06a5 /config/description.exs | |
| parent | da4029391d217b1e2c151e69479de42e2221e02f (diff) | |
| parent | 8ca1f3e8c61b906387e9cb6fb8993d2ad496ab3d (diff) | |
| download | pleroma-49c4e2495357797caa82b4eb0a4d03e8c8dd2730.tar.gz pleroma-49c4e2495357797caa82b4eb0a4d03e8c8dd2730.zip | |
Merge branch 'develop' into fix/csp-for-captcha
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/config/description.exs b/config/description.exs index 370af80a6..03b84bfc8 100644 --- a/config/description.exs +++ b/config/description.exs @@ -498,6 +498,7 @@ config :pleroma, :config_description, [ "dat", "dweb", "gopher", + "hyper", "ipfs", "ipns", "irc", @@ -699,8 +700,9 @@ config :pleroma, :config_description, [ key: :public, type: :boolean, description: - "Makes the client API in authentificated mode-only except for user-profiles." <> - " Useful for disabling the Local Timeline and The Whole Known Network." + "Makes the client API in authenticated mode-only except for user-profiles." <> + " Useful for disabling the Local Timeline and The Whole Known Network. " <> + " Note: when setting to `false`, please also check `:restrict_unauthenticated` setting." }, %{ key: :quarantined_instances, @@ -3446,5 +3448,18 @@ config :pleroma, :config_description, [ suggestions: [false] } ] + }, + %{ + group: :pleroma, + key: :instances_favicons, + type: :group, + description: "Control favicons for instances", + children: [ + %{ + key: :enabled, + type: :boolean, + description: "Allow/disallow displaying and getting instances favicons" + } + ] } ] |