diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-26 05:34:02 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-26 05:34:02 +0000 |
| commit | 9f8e645dce1c3b0b2e3b2d1547821241690c5027 (patch) | |
| tree | 47018b3ec7f2ed22d2317dbf2a6f0ca287d23c4f /docs/config.md | |
| parent | e6f036b9adf91aa81afc676c13ccecf04359241c (diff) | |
| parent | 41e4752950079b80e3d5a06d9806686bd3216dff (diff) | |
| download | pleroma-9f8e645dce1c3b0b2e3b2d1547821241690c5027.tar.gz pleroma-9f8e645dce1c3b0b2e3b2d1547821241690c5027.zip | |
Merge branch 'feature/configurable-pack-extensions' into 'develop'
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
Diffstat (limited to 'docs/config.md')
| -rw-r--r-- | docs/config.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md index 3490d943c..7a53364ef 100644 --- a/docs/config.md +++ b/docs/config.md @@ -606,6 +606,7 @@ Configure OAuth 2 provider capabilities: ## :emoji * `shortcode_globs`: Location of custom emoji files. `*` can be used as a wildcard. Example `["/emoji/custom/**/*.png"]` +* `pack_extensions`: A list of file extensions for emojis, when no emoji.txt for a pack is present. Example `[".png", ".gif"]` * `groups`: Emojis are ordered in groups (tags). This is an array of key-value pairs where the key is the groupname and the value the location or array of locations. `*` can be used as a wildcard. Example `[Custom: ["/emoji/*.png", "/emoji/custom/*.png"]]` * `default_manifest`: Location of the JSON-manifest. This manifest contains information about the emoji-packs you can download. Currently only one manifest can be added (no arrays). |