projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove most finmoji mentions where appropriate
[akkoma]
/
config
/
config.exs
diff --git
a/config/config.exs
b/config/config.exs
index fcad55bbedd43c5244f8b972aa8086eada8e82db..5ea4cb899599286c159611469544c737051bc0a4 100644
(file)
--- 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`
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"
],
default_manifest: "https://git.pleroma.social/vaartis/emoji-index/raw/master/index.json"
@@
-224,7
+223,6
@@
config :pleroma, :instance,
"text/html",
"text/markdown"
],
"text/html",
"text/markdown"
],
- finmoji_enabled: true,
mrf_transparency: true,
autofollowed_nicknames: [],
max_pinned_statuses: 1,
mrf_transparency: true,
autofollowed_nicknames: [],
max_pinned_statuses: 1,