diff options
| author | lain <lain@soykaf.club> | 2024-08-01 08:53:29 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-08-01 08:53:29 +0000 |
| commit | 36d469cf022ea66947a73ee4c762d7f459aceee4 (patch) | |
| tree | 5f8824d56f10d1c94353afeb77833cd250e67369 /docs/configuration/custom_emoji.md | |
| parent | 7566b4a348c66fcea45bcb017979ece9c7b45b3a (diff) | |
| parent | a5d32aab50abf725196fa782775a38907b4b2afa (diff) | |
| download | pleroma-36d469cf022ea66947a73ee4c762d7f459aceee4.tar.gz pleroma-36d469cf022ea66947a73ee4c762d7f459aceee4.zip | |
Merge branch 'release/2.7.0' into 'stable'
v2.7.0
See merge request pleroma/pleroma!4179
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"] ``` |