X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=config%2Fconfig.exs;h=5ea4cb899599286c159611469544c737051bc0a4;hb=8f93d4c42366ccce1949717ad2a9e1de0f91011b;hp=fcad55bbedd43c5244f8b972aa8086eada8e82db;hpb=1f3ddb031cdc554552d80a5974b28897c1e764dc;p=akkoma 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,