summaryrefslogtreecommitdiff
path: root/docs/configuration/custom_emoji.md
diff options
context:
space:
mode:
authorLain Soykaf <lain@lain.com>2024-05-20 18:21:46 +0400
committerLain Soykaf <lain@lain.com>2024-05-20 18:21:46 +0400
commitc67506ba689633cd65f266610f2cd2a5da34912b (patch)
tree173b9cc6938d0dd9dd69623079ef080f052d1807 /docs/configuration/custom_emoji.md
parent086ba59d0346be870dc7df2660fbb55666bf0af7 (diff)
parente8cd6662eb2a534e3be16b522bf81b25b194edab (diff)
downloadpleroma-c67506ba689633cd65f266610f2cd2a5da34912b.tar.gz
pleroma-c67506ba689633cd65f266610f2cd2a5da34912b.zip
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into auth-fetch-exception
Diffstat (limited to 'docs/configuration/custom_emoji.md')
-rw-r--r--docs/configuration/custom_emoji.md2
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"]
```