diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-10 08:55:15 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-07-10 08:55:15 +0000 |
| commit | 4ac6e6283f6e090588ad56066b1e552b895f3a24 (patch) | |
| tree | c6536c1ab63ea26913b649cc3f64cea438b62f38 /config/description.exs | |
| parent | c2be0da79fcc95399647b292e0b9a4119d3dcdf1 (diff) | |
| parent | 5ea638757210c34b40fb568e537082b78f4118a6 (diff) | |
| download | pleroma-4ac6e6283f6e090588ad56066b1e552b895f3a24.tar.gz pleroma-4ac6e6283f6e090588ad56066b1e552b895f3a24.zip | |
Merge branch 'develop' into 'admin-api-user-credentials-for-remote-users-fix'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'config/description.exs')
| -rw-r--r-- | config/description.exs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs index 705ba83d0..03b84bfc8 100644 --- a/config/description.exs +++ b/config/description.exs @@ -3448,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" + } + ] } ] |