diff options
| author | marcin mikołajczak <git@mkljczk.pl> | 2024-03-18 13:50:25 +0100 |
|---|---|---|
| committer | marcin mikołajczak <git@mkljczk.pl> | 2024-03-18 13:50:25 +0100 |
| commit | 918c406a914d49b15beb3611e1c780d0e0d253cd (patch) | |
| tree | f54000d2e2f19ad97c75f71f443cff6b9810f5ca /docs/configuration/custom_emoji.md | |
| parent | 90b442727e4e2e56b4b68a15172a5ef7516531df (diff) | |
| parent | cf0aa1238ccd137219253d76355f2dc0f89679ac (diff) | |
| download | pleroma-918c406a914d49b15beb3611e1c780d0e0d253cd.tar.gz pleroma-918c406a914d49b15beb3611e1c780d0e0d253cd.zip | |
Merge remote-tracking branch 'origin/develop' into instance_rules
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
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"] ``` |