X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Femoji.ex;h=6f9bd3eda7d9c77005071a4a18677c2bdc9dcaf0;hb=8f93d4c42366ccce1949717ad2a9e1de0f91011b;hp=16909443843c9a37932f6a7ecf700a278faabd24;hpb=1f3ddb031cdc554552d80a5974b28897c1e764dc;p=akkoma 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