summaryrefslogtreecommitdiff
path: root/config
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 /config
parent1f3ddb031cdc554552d80a5974b28897c1e764dc (diff)
downloadpleroma-8f93d4c42366ccce1949717ad2a9e1de0f91011b.tar.gz
pleroma-8f93d4c42366ccce1949717ad2a9e1de0f91011b.zip
Remove most finmoji mentions where appropriate
Diffstat (limited to 'config')
-rw-r--r--config/config.exs4
1 files changed, 1 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs
index fcad55bbe..5ea4cb899 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -100,8 +100,7 @@ config :pleroma, :emoji,
shortcode_globs: ["/emoji/custom/**/*.png"],
groups: [
# Put groups that have higher priority than defaults here. Example in `docs/config/custom_emoji.md`
- Finmoji: ["/finmoji/128px/*-128.png"],
- Custom: ["/emoji/*.png", "/emoji/custom/*.png"]
+ Custom: ["/emoji/*.png", "/emoji/**/*.png"]
],
default_manifest: "https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json"
@@ -224,7 +223,6 @@ config :pleroma, :instance,
"text/html",
"text/markdown"
],
- finmoji_enabled: true,
mrf_transparency: true,
autofollowed_nicknames: [],
max_pinned_statuses: 1,