diff options
| author | Lain Soykaf <lain@lain.com> | 2024-05-27 17:49:31 +0400 |
|---|---|---|
| committer | Lain Soykaf <lain@lain.com> | 2024-05-27 17:49:31 +0400 |
| commit | 4325b1aec34734d8efbc7701d6bfdcf157e7cb0d (patch) | |
| tree | 7995ee0c521da831709f1198ca7154fad0885306 /docs/configuration/custom_emoji.md | |
| parent | 3a03d9b65f96099e7c7a831469532c2cec7294c6 (diff) | |
| parent | 6757382abec9ca47a9025b8bed61047414cee20f (diff) | |
| download | pleroma-4325b1aec34734d8efbc7701d6bfdcf157e7cb0d.tar.gz pleroma-4325b1aec34734d8efbc7701d6bfdcf157e7cb0d.zip | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into nsfw-api-mrf
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"] ``` |