diff options
author | Lain Soykaf <lain@lain.com> | 2024-05-27 20:03:14 +0400 |
---|---|---|
committer | Lain Soykaf <lain@lain.com> | 2024-05-27 20:03:14 +0400 |
commit | f4c0a01f097ec9d6d61dff3abfcda616b23e01e6 (patch) | |
tree | e821106c60e3180005be5add7a18dbe569171a74 /docs/configuration/custom_emoji.md | |
parent | 197647a04e66c1af3ae691a4507612fdbee9c48c (diff) | |
parent | 7798fdc71121459f479e0729fefdac195b1dca7d (diff) | |
download | pleroma-f4c0a01f097ec9d6d61dff3abfcda616b23e01e6.tar.gz pleroma-f4c0a01f097ec9d6d61dff3abfcda616b23e01e6.zip |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into image-description-summary
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"] ``` |