diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-03-07 13:13:49 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-03-07 13:13:49 +0100 |
| commit | b7c625db0f8090ce11c75a19fbaee8f985b966c3 (patch) | |
| tree | 0d631e593dd195014fc35d7203f82f331b35aff0 /docs/configuration/custom_emoji.md | |
| parent | 47ce33a90d09878d5231ce9654853ebcd1b88c08 (diff) | |
| parent | 8298b326a7a3081be262c73f734dfe3082962e83 (diff) | |
| download | pleroma-b7c625db0f8090ce11c75a19fbaee8f985b966c3.tar.gz pleroma-b7c625db0f8090ce11c75a19fbaee8f985b966c3.zip | |
Merge remote-tracking branch 'origin/develop' into link-verification
Diffstat (limited to 'docs/configuration/custom_emoji.md')
| -rw-r--r-- | docs/configuration/custom_emoji.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/configuration/custom_emoji.md b/docs/configuration/custom_emoji.md index 1648840fd..19250cf80 100644 --- a/docs/configuration/custom_emoji.md +++ b/docs/configuration/custom_emoji.md @@ -29,7 +29,7 @@ foo, /emoji/custom/foo.png The files should be PNG (APNG is okay with `.png` for `image/png` Content-type) and under 50kb for compatibility with mastodon. -Default file extentions and locations for emojis are set in `config.exs`. To use different locations or file-extentions, add the `shortcode_globs` to your secrets file (`prod.secret.exs` or `dev.secret.exs`) and edit it. Note that not all fediverse-software will show emojis with other file extentions: +Default file extensions and locations for emojis are set in `config.exs`. To use different locations or file-extensions, add the `shortcode_globs` to your secrets file (`prod.secret.exs` or `dev.secret.exs`) and edit it. Note that not all fediverse-software will show emojis with other file extensions: ```elixir config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png", "/emoji/custom/**/*.gif"] ``` |