aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorEkaterina Vaartis <vaartis@cock.li>2019-04-20 15:34:45 +0300
committerEkaterina Vaartis <vaartis@cock.li>2019-04-20 15:42:14 +0300
commit8f93d4c42366ccce1949717ad2a9e1de0f91011b (patch)
tree79ab70837705e086fede47aafb0da691374eeb6f /lib
parent1f3ddb031cdc554552d80a5974b28897c1e764dc (diff)
downloadpleroma-8f93d4c42366ccce1949717ad2a9e1de0f91011b.tar.gz
Remove most finmoji mentions where appropriate
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/emoji.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/emoji.ex b/lib/pleroma/emoji.ex
index 169094438..6f9bd3eda 100644
--- a/lib/pleroma/emoji.ex
+++ b/lib/pleroma/emoji.ex
@@ -6,7 +6,7 @@ defmodule Pleroma.Emoji do
@moduledoc """
The emojis are loaded from:
- * the built-in Finmojis (if enabled in configuration),
+ * emoji packs in INSTANCE-DIR/emoji
* the files: `config/emoji.txt` and `config/custom_emoji.txt`
* glob paths, nested folder is used as tag name for grouping e.g. priv/static/emoji/custom/nested_folder