diff options
| author | kaniini <nenolod@gmail.com> | 2019-04-23 02:41:21 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-04-23 02:41:21 +0000 |
| commit | 7dcac0bac0252e2c824e6139196dca9d28903ad8 (patch) | |
| tree | 1c15303fe7d8d1fa374b1df63494735f82e266fc /docs/config.md | |
| parent | 414902cd9e61d19d4dcd848f60b47beaf23c095f (diff) | |
| parent | 74ef14b04e6decf05bd61ef44ea459c24273f192 (diff) | |
| download | pleroma-7dcac0bac0252e2c824e6139196dca9d28903ad8.tar.gz | |
Merge branch 'develop' into 'develop'
Add shortcode_globs setting to documentation
See merge request pleroma/pleroma!1087
Diffstat (limited to 'docs/config.md')
| -rw-r--r-- | docs/config.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docs/config.md b/docs/config.md index d8eb4f8b5..7b6631f9b 100644 --- a/docs/config.md +++ b/docs/config.md @@ -487,3 +487,8 @@ config :ueberauth, Ueberauth, microsoft: {Ueberauth.Strategy.Microsoft, [callback_params: []]} ] ``` + +## :emoji +* `shortcode_globs`: Location of custom emoji files. `*` can be used as a wildcard. Example `["/emoji/custom/**/*.png"]` +* `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). |