diff options
| author | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-18 10:26:41 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivant.business@gmail.com> | 2019-03-18 10:26:41 +0300 |
| commit | 2a96283efbd46c017cf9e15ef4fda3188e5e5bca (patch) | |
| tree | 3265b9ff9f830a366d14870486c85ddcd08f51c9 /docs/Custom-Emoji.md | |
| parent | 273905744242b013ba9736ff7e1415a0499022d1 (diff) | |
| parent | 1344e34ed3a337b54e450af474f81e2f326bf768 (diff) | |
| download | pleroma-2a96283efbd46c017cf9e15ef4fda3188e5e5bca.tar.gz pleroma-2a96283efbd46c017cf9e15ef4fda3188e5e5bca.zip | |
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
Diffstat (limited to 'docs/Custom-Emoji.md')
| -rw-r--r-- | docs/Custom-Emoji.md | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/Custom-Emoji.md b/docs/Custom-Emoji.md index d4af5c97c..9d90e5822 100644 --- a/docs/Custom-Emoji.md +++ b/docs/Custom-Emoji.md @@ -1,3 +1,5 @@ +# Custom emoji + To add custom emoji: * Add the image file(s) to `priv/static/emoji/custom` * In case of conflicts: add the desired shortcode with the path to `config/custom_emoji.txt`, comma-separated and one per line |