aboutsummaryrefslogtreecommitdiff
path: root/docs/Custom-Emoji.md
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-03-15 19:51:06 +0000
committerkaniini <nenolod@gmail.com>2019-03-15 19:51:06 +0000
commitb010f9733d6ee5c65cef276284e4c9d702f2c8b7 (patch)
treec9196e13794fefb9e4440a795a74ad51f9402550 /docs/Custom-Emoji.md
parent41fc67aa4993c119dae82578df7309d3999ac47a (diff)
parentf5b54acc8160dc1ecf4523d98e971eff8bc983de (diff)
downloadpleroma-b010f9733d6ee5c65cef276284e4c9d702f2c8b7.tar.gz
Merge branch 'docs/ex_doc-929-wiki-imports' into 'develop'
Fix headers and add !929 docs to extras See merge request pleroma/pleroma!940
Diffstat (limited to 'docs/Custom-Emoji.md')
-rw-r--r--docs/Custom-Emoji.md2
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