diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-04-15 13:57:38 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-04-15 13:57:38 +0000 |
| commit | 776f1e3bdf148b2a9be4b99fff0578af76a700cb (patch) | |
| tree | d4e87cb5d9a1ec15e58d4fc498eedfa951c833f9 /docs | |
| parent | 56956de6fa1818d52e870fe719e6e20a0e408a30 (diff) | |
| parent | 088f378408e7bc9b4dd916141cba813de3276e90 (diff) | |
| download | pleroma-776f1e3bdf148b2a9be4b99fff0578af76a700cb.tar.gz | |
Merge branch 'remove-footguns' into 'develop'
Remove ambiguous documentation regarding emoji and config.exs
See merge request pleroma/pleroma!1064
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/config/custom_emoji.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/config/custom_emoji.md b/docs/config/custom_emoji.md index 419a7d0e2..5ce9865a2 100644 --- a/docs/config/custom_emoji.md +++ b/docs/config/custom_emoji.md @@ -20,7 +20,7 @@ The files should be PNG (APNG is okay with `.png` for `image/png` Content-type) ## Emoji tags (groups) -Default tags are set in `config.exs`. +Default tags are set in `config.exs`. To set your own tags, copy the structure to your secrets file (`prod.secret.exs` or `dev.secret.exs`) and edit it. ```elixir config :pleroma, :emoji, shortcode_globs: ["/emoji/custom/**/*.png"], |